home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 13.5 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 32 38 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:28 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 70 74 63 68 2e 65 6c 0a |f/ediff-|ptch.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 | (err|or "`edi|
|000001f0| 66 66 2d 70 74 63 68 2e | 65 6c 27 20 77 61 73 20 |ff-ptch.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 c5 c6 |code "..|!.......|
|00000270| c7 c8 c9 ca 26 09 88 cb | 0e 0c 42 16 0c cd 0e 0c |....&...|..B.....|
|00000280| 42 16 0c ce 0e 0c 42 16 | 0c cf 0e 0c 42 16 0c d0 |B.....B.|....B...|
|00000290| 0e 0c 42 16 0c d1 d2 21 | 87 22 20 5b 70 72 6f 76 |..B....!|." [prov|
|000002a0| 69 64 65 20 65 64 69 66 | 66 2d 70 74 63 68 20 63 |ide edif|f-ptch c|
|000002b0| 75 73 74 6f 6d 2d 64 65 | 63 6c 61 72 65 2d 67 72 |ustom-de|clare-gr|
|000002c0| 6f 75 70 20 6e 69 6c 20 | 22 45 64 69 66 66 20 70 |oup nil |"Ediff p|
|000002d0| 61 74 63 68 20 73 75 70 | 70 6f 72 74 22 20 3a 74 |atch sup|port" :t|
|000002e0| 61 67 20 22 50 61 74 63 | 68 22 20 3a 70 72 65 66 |ag "Patc|h" :pref|
|000002f0| 69 78 20 22 65 64 69 66 | 66 2d 22 20 3a 67 72 6f |ix "edif|f-" :gro|
|00000300| 75 70 20 65 64 69 66 66 | 20 65 64 69 66 66 2d 77 |up ediff| ediff-w|
|00000310| 69 6e 64 6f 77 2d 41 20 | 63 75 72 72 65 6e 74 2d |indow-A |current-|
|00000320| 6c 6f 61 64 2d 6c 69 73 | 74 20 65 64 69 66 66 2d |load-lis|t ediff-|
|00000330| 77 69 6e 64 6f 77 2d 42 | 20 65 64 69 66 66 2d 77 |window-B| ediff-w|
|00000340| 69 6e 64 6f 77 2d 43 20 | 65 64 69 66 66 2d 75 73 |indow-C |ediff-us|
|00000350| 65 2d 6c 61 73 74 2d 64 | 69 72 20 65 64 69 66 66 |e-last-d|ir ediff|
|00000360| 2d 73 68 65 6c 6c 20 72 | 65 71 75 69 72 65 20 65 |-shell r|equire e|
|00000370| 64 69 66 66 2d 69 6e 69 | 74 5d 20 31 30 29 0a 28 |diff-ini|t] 10).(|
|00000380| 63 75 73 74 6f 6d 2d 64 | 65 63 6c 61 72 65 2d 76 |custom-d|eclare-v|
|00000390| 61 72 69 61 62 6c 65 20 | 27 65 64 69 66 66 2d 70 |ariable |'ediff-p|
|000003a0| 61 74 63 68 2d 70 72 6f | 67 72 61 6d 20 27 22 70 |atch-pro|gram '"p|
|000003b0| 61 74 63 68 22 20 22 2a | 4e 61 6d 65 20 6f 66 20 |atch" "*|Name of |
|000003c0| 74 68 65 20 70 72 6f 67 | 72 61 6d 20 74 68 61 74 |the prog|ram that|
|000003d0| 20 61 70 70 6c 69 65 73 | 20 70 61 74 63 68 65 73 | applies| patches|
|000003e0| 2e 5c 6e 49 74 20 69 73 | 20 72 65 63 6f 6d 6d 65 |.\nIt is| recomme|
|000003f0| 6e 64 65 64 20 74 6f 20 | 75 73 65 20 47 4e 55 2d |nded to |use GNU-|
|00000400| 63 6f 6d 70 61 74 69 62 | 6c 65 20 76 65 72 73 69 |compatib|le versi|
|00000410| 6f 6e 73 2e 22 20 3a 74 | 79 70 65 20 27 73 74 72 |ons." :t|ype 'str|
|00000420| 69 6e 67 20 3a 67 72 6f | 75 70 20 27 65 64 69 66 |ing :gro|up 'edif|
|00000430| 66 2d 70 74 63 68 29 0a | 28 63 75 73 74 6f 6d 2d |f-ptch).|(custom-|
|00000440| 64 65 63 6c 61 72 65 2d | 76 61 72 69 61 62 6c 65 |declare-|variable|
|00000450| 20 27 65 64 69 66 66 2d | 70 61 74 63 68 2d 6f 70 | 'ediff-|patch-op|
|00000460| 74 69 6f 6e 73 20 27 22 | 2d 66 22 20 22 2a 4f 70 |tions '"|-f" "*Op|
|00000470| 74 69 6f 6e 73 20 74 6f | 20 70 61 73 73 20 74 6f |tions to| pass to|
|00000480| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 70 72 6f | ediff-p|atch-pro|
|00000490| 67 72 61 6d 2e 5c 6e 5c | 6e 4e 6f 74 65 3a 20 74 |gram.\n\|nNote: t|
|000004a0| 68 65 20 60 2d 62 27 20 | 6f 70 74 69 6f 6e 20 73 |he `-b' |option s|
|000004b0| 68 6f 75 6c 64 20 62 65 | 20 73 70 65 63 69 66 69 |hould be| specifi|
|000004c0| 65 64 20 69 6e 20 60 65 | 64 69 66 66 2d 62 61 63 |ed in `e|diff-bac|
|000004d0| 6b 75 70 2d 73 70 65 63 | 73 27 2e 5c 6e 5c 6e 49 |kup-spec|s'.\n\nI|
|000004e0| 74 20 69 73 20 72 65 63 | 6f 6d 6d 65 6e 64 65 64 |t is rec|ommended|
|000004f0| 20 74 6f 20 70 61 73 73 | 20 74 68 65 20 60 2d 66 | to pass| the `-f|
|00000500| 27 20 6f 70 74 69 6f 6e | 20 74 6f 20 74 68 65 20 |' option| to the |
|00000510| 70 61 74 63 68 20 70 72 | 6f 67 72 61 6d 2c 20 73 |patch pr|ogram, s|
|00000520| 6f 20 69 74 20 77 6f 6e | 27 74 20 61 73 6b 5c 6e |o it won|'t ask\n|
|00000530| 71 75 65 73 74 69 6f 6e | 73 2e 20 48 6f 77 65 76 |question|s. Howev|
|00000540| 65 72 2c 20 73 6f 6d 65 | 20 69 6d 70 6c 65 6d 65 |er, some| impleme|
|00000550| 6e 74 61 74 69 6f 6e 73 | 20 64 6f 6e 27 74 20 61 |ntations| don't a|
|00000560| 63 63 65 70 74 20 74 68 | 69 73 20 6f 70 74 69 6f |ccept th|is optio|
|00000570| 6e 2c 20 69 6e 20 77 68 | 69 63 68 5c 6e 63 61 73 |n, in wh|ich\ncas|
|00000580| 65 20 74 68 65 20 64 65 | 66 61 75 6c 74 20 76 61 |e the de|fault va|
|00000590| 6c 75 65 20 66 6f 72 20 | 74 68 69 73 20 76 61 72 |lue for |this var|
|000005a0| 69 61 62 6c 65 20 73 68 | 6f 75 6c 64 20 62 65 20 |iable sh|ould be |
|000005b0| 63 68 61 6e 67 65 64 2e | 22 20 3a 74 79 70 65 20 |changed.|" :type |
|000005c0| 27 73 74 72 69 6e 67 20 | 3a 67 72 6f 75 70 20 27 |'string |:group '|
|000005d0| 65 64 69 66 66 2d 70 74 | 63 68 29 0a 23 40 36 30 |ediff-pt|ch).#@60|
|000005e0| 20 4c 61 73 74 20 64 69 | 72 65 63 74 6f 72 79 20 | Last di|rectory |
|000005f0| 75 73 65 64 20 62 79 20 | 61 6e 20 45 64 69 66 66 |used by |an Ediff|
|00000600| 20 63 6f 6d 6d 61 6e 64 | 20 66 6f 72 20 66 69 6c | command| for fil|
|00000610| 65 20 74 6f 20 70 61 74 | 63 68 2e 1f 0a 28 64 65 |e to pat|ch...(de|
|00000620| 66 76 61 72 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |fvar edi|ff-last-|
|00000630| 64 69 72 2d 70 61 74 63 | 68 20 6e 69 6c 20 28 23 |dir-patc|h nil (#|
|00000640| 24 20 2e 20 31 35 30 35 | 29 29 0a 28 62 79 74 65 |$ . 1505|)).(byte|
|00000650| 2d 63 6f 64 65 20 22 08 | c1 73 ab 83 c2 aa 81 c3 |-code ".|.s......|
|00000660| 14 c4 0d 42 15 c4 87 22 | 20 5b 73 79 73 74 65 6d |...B..."| [system|
|00000670| 2d 74 79 70 65 20 28 76 | 61 78 2d 76 6d 73 20 61 |-type (v|ax-vms a|
|00000680| 78 70 2d 76 6d 73 20 65 | 6d 78 20 6d 73 2d 64 6f |xp-vms e|mx ms-do|
|00000690| 73 29 20 22 5f 6f 72 69 | 67 22 20 22 2e 6f 72 69 |s) "_ori|g" ".ori|
|000006a0| 67 22 20 65 64 69 66 66 | 2d 64 65 66 61 75 6c 74 |g" ediff|-default|
|000006b0| 2d 62 61 63 6b 75 70 2d | 65 78 74 65 6e 73 69 6f |-backup-|extensio|
|000006c0| 6e 20 63 75 72 72 65 6e | 74 2d 6c 6f 61 64 2d 6c |n curren|t-load-l|
|000006d0| 69 73 74 5d 20 32 29 0a | 28 63 75 73 74 6f 6d 2d |ist] 2).|(custom-|
|000006e0| 64 65 63 6c 61 72 65 2d | 76 61 72 69 61 62 6c 65 |declare-|variable|
|000006f0| 20 27 65 64 69 66 66 2d | 62 61 63 6b 75 70 2d 65 | 'ediff-|backup-e|
|00000700| 78 74 65 6e 73 69 6f 6e | 20 27 65 64 69 66 66 2d |xtension| 'ediff-|
|00000710| 64 65 66 61 75 6c 74 2d | 62 61 63 6b 75 70 2d 65 |default-|backup-e|
|00000720| 78 74 65 6e 73 69 6f 6e | 20 22 42 61 63 6b 75 70 |xtension| "Backup|
|00000730| 20 65 78 74 65 6e 73 69 | 6f 6e 20 75 73 65 64 20 | extensi|on used |
|00000740| 62 79 20 74 68 65 20 70 | 61 74 63 68 20 70 72 6f |by the p|atch pro|
|00000750| 67 72 61 6d 2e 5c 6e 53 | 65 65 20 61 6c 73 6f 20 |gram.\nS|ee also |
|00000760| 60 65 64 69 66 66 2d 62 | 61 63 6b 75 70 2d 73 70 |`ediff-b|ackup-sp|
|00000770| 65 63 73 27 2e 22 20 3a | 74 79 70 65 20 27 73 74 |ecs'." :|type 'st|
|00000780| 72 69 6e 67 20 3a 67 72 | 6f 75 70 20 27 65 64 69 |ring :gr|oup 'edi|
|00000790| 66 66 2d 70 74 63 68 29 | 0a 28 64 65 66 61 6c 69 |ff-ptch)|.(defali|
|000007a0| 61 73 20 27 65 64 69 66 | 66 2d 74 65 73 74 2d 70 |as 'edif|f-test-p|
|000007b0| 61 74 63 68 2d 75 74 69 | 6c 69 74 79 20 23 5b 6e |atch-uti|lity #[n|
|000007c0| 69 6c 20 22 c0 09 c2 89 | 89 c3 c4 26 06 c5 55 ab |il "....|...&..U.|
|000007d0| 82 c6 87 c0 09 c2 89 89 | c4 25 c5 55 ab 82 c7 87 |........|.%.U....|
|000007e0| c8 87 22 20 5b 63 61 6c | 6c 2d 70 72 6f 63 65 73 |.." [cal|l-proces|
|000007f0| 73 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 70 72 |s ediff-|patch-pr|
|00000800| 6f 67 72 61 6d 20 6e 69 | 6c 20 22 2d 7a 2e 22 20 |ogram ni|l "-z." |
|00000810| 22 2d 62 22 20 30 20 67 | 6e 75 20 70 6f 73 69 78 |"-b" 0 g|nu posix|
|00000820| 20 74 72 61 64 69 74 69 | 6f 6e 61 6c 5d 20 37 5d | traditi|onal] 7]|
|00000830| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|00000840| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|00000850| 66 2d 62 61 63 6b 75 70 | 2d 73 70 65 63 73 20 27 |f-backup|-specs '|
|00000860| 28 6c 65 74 20 28 28 74 | 79 70 65 20 28 65 64 69 |(let ((t|ype (edi|
|00000870| 66 66 2d 74 65 73 74 2d | 70 61 74 63 68 2d 75 74 |ff-test-|patch-ut|
|00000880| 69 6c 69 74 79 29 29 29 | 20 28 63 6f 6e 64 20 28 |ility)))| (cond (|
|00000890| 28 65 71 20 74 79 70 65 | 20 27 67 6e 75 29 20 28 |(eq type| 'gnu) (|
|000008a0| 66 6f 72 6d 61 74 20 22 | 2d 7a 25 73 20 2d 62 22 |format "|-z%s -b"|
|000008b0| 20 65 64 69 66 66 2d 62 | 61 63 6b 75 70 2d 65 78 | ediff-b|ackup-ex|
|000008c0| 74 65 6e 73 69 6f 6e 29 | 29 20 28 28 65 71 20 74 |tension)|) ((eq t|
|000008d0| 79 70 65 20 27 70 6f 73 | 69 78 29 20 28 73 65 74 |ype 'pos|ix) (set|
|000008e0| 71 20 65 64 69 66 66 2d | 62 61 63 6b 75 70 2d 65 |q ediff-|backup-e|
|000008f0| 78 74 65 6e 73 69 6f 6e | 20 65 64 69 66 66 2d 64 |xtension| ediff-d|
|00000900| 65 66 61 75 6c 74 2d 62 | 61 63 6b 75 70 2d 65 78 |efault-b|ackup-ex|
|00000910| 74 65 6e 73 69 6f 6e 29 | 20 22 2d 62 22 29 20 28 |tension)| "-b") (|
|00000920| 74 20 28 66 6f 72 6d 61 | 74 20 22 2d 62 20 25 73 |t (forma|t "-b %s|
|00000930| 22 20 65 64 69 66 66 2d | 62 61 63 6b 75 70 2d 65 |" ediff-|backup-e|
|00000940| 78 74 65 6e 73 69 6f 6e | 29 29 29 29 20 22 2a 42 |xtension|)))) "*B|
|00000950| 61 63 6b 75 70 20 64 69 | 72 65 63 74 69 76 65 73 |ackup di|rectives|
|00000960| 20 74 6f 20 70 61 73 73 | 20 74 6f 20 74 68 65 20 | to pass| to the |
|00000970| 70 61 74 63 68 20 70 72 | 6f 67 72 61 6d 2e 5c 6e |patch pr|ogram.\n|
|00000980| 45 64 69 66 66 20 72 65 | 71 75 69 72 65 73 20 74 |Ediff re|quires t|
|00000990| 68 61 74 20 74 68 65 20 | 6f 6c 64 20 76 65 72 73 |hat the |old vers|
|000009a0| 69 6f 6e 20 6f 66 20 74 | 68 65 20 66 69 6c 65 20 |ion of t|he file |
|000009b0| 28 62 65 66 6f 72 65 20 | 61 70 70 6c 79 69 6e 67 |(before |applying|
|000009c0| 20 74 68 65 20 70 61 74 | 63 68 29 5c 6e 62 65 20 | the pat|ch)\nbe |
|000009d0| 73 61 76 65 64 20 69 6e | 20 61 20 66 69 6c 65 20 |saved in| a file |
|000009e0| 6e 61 6d 65 64 20 60 74 | 68 65 2d 70 61 74 63 68 |named `t|he-patch|
|000009f0| 2d 66 69 6c 65 2e 65 78 | 74 65 6e 73 69 6f 6e 27 |-file.ex|tension'|
|00000a00| 2e 20 55 73 75 61 6c 6c | 79 20 60 65 78 74 65 6e |. Usuall|y `exten|
|00000a10| 73 69 6f 6e 27 20 69 73 | 5c 6e 60 2e 6f 72 69 67 |sion' is|\n`.orig|
|00000a20| 27 2c 20 62 75 74 20 74 | 68 69 73 20 63 61 6e 20 |', but t|his can |
|00000a30| 62 65 20 63 68 61 6e 67 | 65 64 20 62 79 20 74 68 |be chang|ed by th|
|00000a40| 65 20 75 73 65 72 20 61 | 6e 64 20 6d 61 79 20 64 |e user a|nd may d|
|00000a50| 65 70 65 6e 64 20 6f 6e | 20 74 68 65 20 73 79 73 |epend on| the sys|
|00000a60| 74 65 6d 2e 5c 6e 54 68 | 65 72 65 66 6f 72 65 2c |tem.\nTh|erefore,|
|00000a70| 20 45 64 69 66 66 20 6e | 65 65 64 73 20 74 6f 20 | Ediff n|eeds to |
|00000a80| 6b 6e 6f 77 20 74 68 65 | 20 62 61 63 6b 75 70 20 |know the| backup |
|00000a90| 65 78 74 65 6e 73 69 6f | 6e 20 75 73 65 64 20 62 |extensio|n used b|
|00000aa0| 79 20 74 68 65 20 70 61 | 74 63 68 20 70 72 6f 67 |y the pa|tch prog|
|00000ab0| 72 61 6d 2e 5c 6e 5c 6e | 53 6f 6d 65 20 76 65 72 |ram.\n\n|Some ver|
|00000ac0| 73 69 6f 6e 73 20 6f 66 | 20 74 68 65 20 70 61 74 |sions of| the pat|
|00000ad0| 63 68 20 70 72 6f 67 72 | 61 6d 20 6c 65 74 20 79 |ch progr|am let y|
|00000ae0| 6f 75 20 73 70 65 63 69 | 66 79 20 60 2d 62 20 62 |ou speci|fy `-b b|
|00000af0| 61 63 6b 75 70 2d 65 78 | 74 65 6e 73 69 6f 6e 27 |ackup-ex|tension'|
|00000b00| 2e 5c 6e 4f 74 68 65 72 | 20 76 65 72 73 69 6f 6e |.\nOther| version|
|00000b10| 73 20 6f 6e 6c 79 20 70 | 65 72 6d 69 74 20 60 2d |s only p|ermit `-|
|00000b20| 62 27 2c 20 77 68 69 63 | 68 20 61 73 73 75 6d 65 |b', whic|h assume|
|00000b30| 73 20 74 68 65 20 65 78 | 74 65 6e 73 69 6f 6e 20 |s the ex|tension |
|00000b40| 60 2e 6f 72 69 67 27 5c | 6e 28 69 6e 20 77 68 69 |`.orig'\|n(in whi|
|00000b50| 63 68 20 63 61 73 65 20 | 65 64 69 66 66 2d 62 61 |ch case |ediff-ba|
|00000b60| 63 6b 75 70 2d 65 78 74 | 65 6e 73 69 6f 6e 20 4d |ckup-ext|ension M|
|00000b70| 55 53 54 20 62 65 20 61 | 6c 73 6f 20 60 2e 6f 72 |UST be a|lso `.or|
|00000b80| 69 67 27 29 2e 20 54 68 | 65 20 6c 61 74 65 73 74 |ig'). Th|e latest|
|00000b90| 5c 6e 76 65 72 73 69 6f | 6e 73 20 6f 66 20 47 4e |\nversio|ns of GN|
|00000ba0| 55 20 70 61 74 63 68 20 | 72 65 71 75 69 72 65 20 |U patch |require |
|00000bb0| 60 2d 62 20 2d 7a 20 62 | 61 63 6b 75 70 2d 65 78 |`-b -z b|ackup-ex|
|00000bc0| 74 65 6e 73 69 6f 6e 27 | 2e 5c 6e 5c 6e 4e 6f 74 |tension'|.\n\nNot|
|00000bd0| 65 20 74 68 61 74 20 62 | 6f 74 68 20 60 65 64 69 |e that b|oth `edi|
|00000be0| 66 66 2d 62 61 63 6b 75 | 70 2d 65 78 74 65 6e 73 |ff-backu|p-extens|
|00000bf0| 69 6f 6e 27 20 61 6e 64 | 20 60 65 64 69 66 66 2d |ion' and| `ediff-|
|00000c00| 62 61 63 6b 75 70 2d 73 | 70 65 63 73 27 5c 6e 6d |backup-s|pecs'\nm|
|00000c10| 75 73 74 20 62 65 20 73 | 65 74 20 70 72 6f 70 65 |ust be s|et prope|
|00000c20| 72 6c 79 2e 20 49 66 20 | 79 6f 75 72 20 70 61 74 |rly. If |your pat|
|00000c30| 63 68 20 70 72 6f 67 72 | 61 6d 20 74 61 6b 65 73 |ch progr|am takes|
|00000c40| 20 74 68 65 20 6f 70 74 | 69 6f 6e 20 60 2d 62 27 | the opt|ion `-b'|
|00000c50| 2c 5c 6e 62 75 74 20 6e | 6f 74 20 60 2d 62 20 65 |,\nbut n|ot `-b e|
|00000c60| 78 74 65 6e 73 69 6f 6e | 27 2c 20 74 68 65 20 76 |xtension|', the v|
|00000c70| 61 72 69 61 62 6c 65 20 | 60 65 64 69 66 66 2d 62 |ariable |`ediff-b|
|00000c80| 61 63 6b 75 70 2d 65 78 | 74 65 6e 73 69 6f 6e 27 |ackup-ex|tension'|
|00000c90| 20 6d 75 73 74 5c 6e 73 | 74 69 6c 6c 20 62 65 20 | must\ns|till be |
|00000ca0| 73 65 74 20 73 6f 20 45 | 64 69 66 66 20 77 69 6c |set so E|diff wil|
|00000cb0| 6c 20 6b 6e 6f 77 20 77 | 68 69 63 68 20 65 78 74 |l know w|hich ext|
|00000cc0| 65 6e 73 69 6f 6e 20 74 | 6f 20 75 73 65 2e 5c 6e |ension t|o use.\n|
|00000cd0| 5c 6e 45 64 69 66 66 20 | 74 72 69 65 73 20 74 6f |\nEdiff |tries to|
|00000ce0| 20 67 75 65 73 73 20 74 | 68 65 20 61 70 70 72 6f | guess t|he appro|
|00000cf0| 70 72 69 61 74 65 20 76 | 61 6c 75 65 20 66 6f 72 |priate v|alue for|
|00000d00| 20 74 68 69 73 20 76 61 | 72 69 61 62 6c 65 73 2e | this va|riables.|
|00000d10| 20 49 74 20 69 73 20 62 | 65 6c 69 65 76 65 64 5c | It is b|elieved\|
|00000d20| 6e 74 6f 20 62 65 20 77 | 6f 72 6b 69 6e 67 20 66 |nto be w|orking f|
|00000d30| 6f 72 20 60 74 72 61 64 | 69 74 69 6f 6e 61 6c 27 |or `trad|itional'|
|00000d40| 20 70 61 74 63 68 2c 20 | 61 6c 6c 20 76 65 72 73 | patch, |all vers|
|00000d50| 69 6f 6e 73 20 6f 66 20 | 47 4e 55 20 70 61 74 63 |ions of |GNU patc|
|00000d60| 68 2c 20 61 6e 64 20 66 | 6f 72 20 50 4f 53 49 58 |h, and f|or POSIX|
|00000d70| 5c 6e 70 61 74 63 68 2e | 20 53 6f 2c 20 64 6f 6e |\npatch.| So, don|
|00000d80| 27 74 20 63 68 61 6e 67 | 65 20 74 68 65 73 65 20 |'t chang|e these |
|00000d90| 76 61 72 69 61 62 6c 65 | 73 2c 20 75 6e 6c 65 73 |variable|s, unles|
|00000da0| 73 20 74 68 65 20 64 65 | 66 61 75 6c 74 20 64 6f |s the de|fault do|
|00000db0| 65 73 6e 27 74 20 77 6f | 72 6b 2e 22 20 3a 74 79 |esn't wo|rk." :ty|
|00000dc0| 70 65 20 27 73 74 72 69 | 6e 67 20 3a 67 72 6f 75 |pe 'stri|ng :grou|
|00000dd0| 70 20 27 65 64 69 66 66 | 2d 70 74 63 68 29 0a 28 |p 'ediff|-ptch).(|
|00000de0| 63 75 73 74 6f 6d 2d 64 | 65 63 6c 61 72 65 2d 76 |custom-d|eclare-v|
|00000df0| 61 72 69 61 62 6c 65 20 | 27 65 64 69 66 66 2d 70 |ariable |'ediff-p|
|00000e00| 61 74 63 68 2d 64 65 66 | 61 75 6c 74 2d 64 69 72 |atch-def|ault-dir|
|00000e10| 65 63 74 6f 72 79 20 27 | 6e 69 6c 20 22 2a 44 65 |ectory '|nil "*De|
|00000e20| 66 61 75 6c 74 20 64 69 | 72 65 63 74 6f 72 79 20 |fault di|rectory |
|00000e30| 74 6f 20 6c 6f 6f 6b 20 | 66 6f 72 20 70 61 74 63 |to look |for patc|
|00000e40| 68 65 73 2e 22 20 3a 74 | 79 70 65 20 27 28 63 68 |hes." :t|ype '(ch|
|00000e50| 6f 69 63 65 20 28 63 6f | 6e 73 74 20 6e 69 6c 29 |oice (co|nst nil)|
|00000e60| 20 73 74 72 69 6e 67 29 | 20 3a 67 72 6f 75 70 20 | string)| :group |
|00000e70| 27 65 64 69 66 66 2d 70 | 74 63 68 29 0a 28 63 75 |'ediff-p|tch).(cu|
|00000e80| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00000e90| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 63 6f 6e |iable 'e|diff-con|
|00000ea0| 74 65 78 74 2d 64 69 66 | 66 2d 6c 61 62 65 6c 2d |text-dif|f-label-|
|00000eb0| 72 65 67 65 78 70 20 27 | 28 63 6f 6e 63 61 74 20 |regexp '|(concat |
|00000ec0| 22 5c 5c 28 22 20 22 5e | 5c 5c 2a 5c 5c 2a 5c 5c |"\\(" "^|\\*\\*\\|
|00000ed0| 2a 20 5c 5c 28 5b 5e 20 | 09 5d 2b 5c 5c 29 5b 5e |* \\([^ |.]+\\)[^|
|00000ee0| 2a 5d 2b 5b 09 20 5d 2a | 5c 6e 2d 2d 2d 20 5c 5c |*]+[. ]*|\n--- \\|
|00000ef0| 28 5b 5e 20 09 5d 2b 5c | 5c 29 22 20 22 5c 5c 7c |([^ .]+\|\)" "\\||
|00000f00| 22 20 22 5e 2d 2d 2d 20 | 5c 5c 28 5b 5e 20 09 5d |" "^--- |\\([^ .]|
|00000f10| 2b 5c 5c 29 5b 09 20 5d | 2b 2e 2a 5c 6e 5c 5c 2b |+\\)[. ]|+.*\n\\+|
|00000f20| 5c 5c 2b 5c 5c 2b 20 5c | 5c 28 5b 5e 20 09 5d 2b |\\+\\+ \|\([^ .]+|
|00000f30| 5c 5c 29 22 20 22 5c 5c | 29 22 29 20 22 2a 52 65 |\\)" "\\|)") "*Re|
|00000f40| 67 65 78 70 20 6d 61 74 | 63 68 69 6e 67 20 66 69 |gexp mat|ching fi|
|00000f50| 6c 65 6e 61 6d 65 20 32 | 2d 6c 69 6e 65 72 73 20 |lename 2|-liners |
|00000f60| 61 74 20 74 68 65 20 73 | 74 61 72 74 20 6f 66 20 |at the s|tart of |
|00000f70| 65 61 63 68 20 63 6f 6e | 74 65 78 74 20 64 69 66 |each con|text dif|
|00000f80| 66 2e 5c 6e 59 6f 75 20 | 70 72 6f 62 61 62 6c 79 |f.\nYou |probably|
|00000f90| 20 64 6f 6e 27 74 20 77 | 61 6e 74 20 74 6f 20 63 | don't w|ant to c|
|00000fa0| 68 61 6e 67 65 20 74 68 | 61 74 2c 20 75 6e 6c 65 |hange th|at, unle|
|00000fb0| 73 73 20 79 6f 75 20 61 | 72 65 20 75 73 69 6e 67 |ss you a|re using|
|00000fc0| 20 61 6e 20 6f 62 73 63 | 75 72 65 20 70 61 74 63 | an obsc|ure patc|
|00000fd0| 68 5c 6e 70 72 6f 67 72 | 61 6d 2e 22 20 3a 74 79 |h\nprogr|am." :ty|
|00000fe0| 70 65 20 27 72 65 67 65 | 78 70 20 3a 67 72 6f 75 |pe 'rege|xp :grou|
|00000ff0| 70 20 27 65 64 69 66 66 | 2d 70 74 63 68 29 0a 23 |p 'ediff|-ptch).#|
|00001000| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00001010| 66 66 2d 70 61 74 63 68 | 62 75 66 65 72 20 6e 69 |ff-patch|bufer ni|
|00001020| 6c 20 28 23 24 20 2e 20 | 34 30 39 39 29 29 0a 28 |l (#$ . |4099)).(|
|00001030| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00001040| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00001050| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00001060| 61 6c 20 65 64 69 66 66 | 2d 70 61 74 63 68 62 75 |al ediff|-patchbu|
|00001070| 66 65 72 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |fer put |permanen|
|00001080| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00001090| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|000010a0| 66 2d 70 61 74 63 68 2d | 64 69 61 67 6e 6f 73 74 |f-patch-|diagnost|
|000010b0| 69 63 73 20 6e 69 6c 20 | 28 23 24 20 2e 20 34 32 |ics nil |(#$ . 42|
|000010c0| 34 32 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |42)).(by|te-code |
|000010d0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000010e0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000010f0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 70 |er-local| ediff-p|
|00001100| 61 74 63 68 2d 64 69 61 | 67 6e 6f 73 74 69 63 73 |atch-dia|gnostics|
|00001110| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00001120| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 32 20 1f |ocal t] |4).#@2 .|
|00001130| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 70 |.(defvar| ediff-p|
|00001140| 61 74 63 68 2d 6d 61 70 | 20 6e 69 6c 20 28 23 24 |atch-map| nil (#$|
|00001150| 20 2e 20 34 33 39 39 29 | 29 0a 28 62 79 74 65 2d | . 4399)|).(byte-|
|00001160| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00001170| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00001180| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00001190| 69 66 66 2d 70 61 74 63 | 68 2d 6d 61 70 20 70 75 |iff-patc|h-map pu|
|000011a0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000011b0| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 61 6c 69 61 |l t] 4).|(defalia|
|000011c0| 73 20 27 65 64 69 66 66 | 2d 66 69 6c 65 2d 6e 61 |s 'ediff|-file-na|
|000011d0| 6d 65 2d 73 61 6e 73 2d | 70 72 65 66 69 78 20 23 |me-sans-|prefix #|
|000011e0| 5b 28 66 69 6c 65 6e 61 | 6d 65 20 70 72 65 66 69 |[(filena|me prefi|
|000011f0| 78 29 20 22 c0 20 19 c2 | 8e c3 c4 0d 50 0e 06 5c |x) ". ..|....P..\|
|00001200| 22 ab 88 0e 06 c7 95 c8 | 4f aa 84 c9 0e 06 50 2a |".......|O.....P*|
|00001210| 87 22 20 5b 6d 61 74 63 | 68 2d 64 61 74 61 20 6d |." [matc|h-data m|
|00001220| 61 74 63 68 2d 64 61 74 | 61 20 28 28 73 74 6f 72 |atch-dat|a ((stor|
|00001230| 65 2d 6d 61 74 63 68 2d | 64 61 74 61 20 6d 61 74 |e-match-|data mat|
|00001240| 63 68 2d 64 61 74 61 29 | 29 20 73 74 72 69 6e 67 |ch-data)|) string|
|00001250| 2d 6d 61 74 63 68 20 22 | 5e 22 20 70 72 65 66 69 |-match "|^" prefi|
|00001260| 78 20 66 69 6c 65 6e 61 | 6d 65 20 30 20 6e 69 6c |x filena|me 0 nil|
|00001270| 20 22 2f 6e 75 6c 6c 2f | 22 5d 20 33 5d 29 0a 28 | "/null/|"] 3]).(|
|00001280| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4e c2 73 |byte-cod|e "..N.s|
|00001290| ac 85 c3 c4 c0 5c 22 88 | c5 c0 c1 c6 23 87 22 20 |.....\".|....#." |
|000012a0| 5b 65 64 69 66 66 2d 66 | 69 6c 65 2d 6e 61 6d 65 |[ediff-f|ile-name|
|000012b0| 2d 73 61 6e 73 2d 70 72 | 65 66 69 78 20 62 79 74 |-sans-pr|efix byt|
|000012c0| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 20 28 6e 69 6c |e-optimi|zer (nil|
|000012d0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|000012e0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 20 65 72 72 |line-exp|and) err|
|000012f0| 6f 72 20 22 25 73 20 61 | 6c 72 65 61 64 79 20 68 |or "%s a|lready h|
|00001300| 61 73 20 61 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |as a byt|e-optimi|
|00001310| 7a 65 72 2c 20 63 61 6e | 27 74 20 6d 61 6b 65 20 |zer, can|'t make |
|00001320| 69 74 20 69 6e 6c 69 6e | 65 22 20 70 75 74 20 62 |it inlin|e" put b|
|00001330| 79 74 65 2d 63 6f 6d 70 | 69 6c 65 2d 69 6e 6c 69 |yte-comp|ile-inli|
|00001340| 6e 65 2d 65 78 70 61 6e | 64 5d 20 34 29 0a 28 64 |ne-expan|d] 4).(d|
|00001350| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 63 |efalias |'ediff-c|
|00001360| 6f 75 6e 74 2d 6d 61 74 | 63 68 65 73 20 23 5b 28 |ount-mat|ches #[(|
|00001370| 72 65 67 65 78 70 20 62 | 75 66 29 20 22 08 ab bc |regexp b|uf) "...|
|00001380| c1 08 21 ab b7 c2 c1 08 | 21 21 ab b0 72 08 71 88 |..!.....|!!..r.q.|
|00001390| c3 c4 1d 1e 06 8a 65 62 | 88 6d ac 9b 60 15 c7 0e |......eb|.m..`...|
|000013a0| 08 c4 c9 23 ab 91 0d 60 | 55 ab 85 ca 75 88 aa 69 |...#...`|U...u..i|
|000013b0| 0e 06 54 16 06 aa 62 29 | 0e 06 2b 87 0e 0b cc 61 |..T...b)|..+....a|
|000013c0| ae 84 cd 0e 0e 21 87 22 | 20 5b 62 75 66 20 67 65 |.....!."| [buf ge|
|000013d0| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|000013e0| 6e 61 6d 65 20 30 20 6e | 69 6c 20 6f 70 6f 69 6e |name 0 n|il opoin|
|000013f0| 74 20 63 6f 75 6e 74 20 | 72 65 2d 73 65 61 72 63 |t count |re-searc|
|00001400| 68 2d 66 6f 72 77 61 72 | 64 20 72 65 67 65 78 70 |h-forwar|d regexp|
|00001410| 20 74 20 31 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e | t 1 thi|s-comman|
|00001420| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00001430| 6f 72 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |or ediff|-KILLED-|
|00001440| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 5d 20 34 5d |VITAL-BU|FFER] 4]|
|00001450| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00001460| 66 66 2d 6d 61 70 2d 70 | 61 74 63 68 2d 62 75 66 |ff-map-p|atch-buf|
|00001470| 66 65 72 20 23 5b 28 62 | 75 66 29 20 22 08 83 13 |fer #[(b|uf) "...|
|00001480| 01 c1 08 21 83 13 01 c2 | c1 08 21 21 83 13 01 72 |...!....|..!!...r|
|00001490| 08 71 88 c3 c4 20 65 c5 | 93 65 c6 c5 89 89 89 89 |.q... e.|.e......|
|000014a0| 89 89 89 89 1e 07 1e 08 | 1e 09 1e 5c 6e 1e 0b 1e |........|...\n...|
|000014b0| 0c 1e 0d 1e 0e 1e 0f 1e | 10 1e 11 1e 12 1e 13 8a |........|........|
|000014c0| 65 62 88 60 16 07 6d 84 | f9 00 d4 0e 15 c5 d6 23 |eb.`..m.|.......#|
|000014d0| 83 f9 00 0e 07 60 55 ab | 86 d7 75 88 82 ee 00 c4 |.....`U.|..u.....|
|000014e0| 20 c3 94 c5 93 16 0e c3 | 95 16 0f d8 94 ae 82 d9 | .......|........|
|000014f0| 94 16 0c d8 95 ae 82 d9 | 95 16 5c 6e da 94 ae 82 |........|..\n....|
|00001500| db 94 16 0b da 95 ae 82 | db 95 16 09 0e 0c ab 8b |........|........|
|00001510| 0e 5c 6e ab 87 0e 0c 0e | 5c 6e 7b aa 81 dc 0e 0b |.\n.....|\n{.....|
|00001520| ab 8b 0e 09 ab 87 0e 0b | 0e 09 7b aa 81 dc 42 16 |........|..{...B.|
|00001530| 10 dd de 0e 11 df 23 ab | 87 0e 0e c3 94 c5 93 88 |......#.|........|
|00001540| dd e0 0e 11 df 23 ab 87 | 0e 0e c3 94 c5 93 88 0e |.....#..|........|
|00001550| 0f 62 88 0e 0d ab 8c 0e | 0d 0e 12 0e 0e 45 0e 08 |.b......|.....E..|
|00001560| 42 16 08 0e 0e 16 12 0e | 0f 16 11 0e 10 16 0d 60 |B.......|.......`|
|00001570| 16 07 0e 13 54 16 13 82 | 48 00 29 e1 20 16 0e 0e |....T...|H.). ...|
|00001580| 10 0e 12 0e 0e 45 0e 08 | 42 89 16 08 9f 16 5c 22 |.....E..|B.....\"|
|00001590| 0e 13 2e 0e 87 0e 23 e4 | 61 ae 84 e5 0e 26 21 87 |......#.|a....&!.|
|000015a0| 22 20 5b 62 75 66 20 67 | 65 74 2d 62 75 66 66 65 |" [buf g|et-buffe|
|000015b0| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 30 20 |r buffer|-name 0 |
|000015c0| 6d 61 6b 65 2d 6d 61 72 | 6b 65 72 20 6e 69 6c 20 |make-mar|ker nil |
|000015d0| 28 22 2f 64 65 76 2f 6e | 75 6c 6c 22 20 2e 20 22 |("/dev/n|ull" . "|
|000015e0| 2f 64 65 76 2f 6e 75 6c | 6c 22 29 20 6f 70 6f 69 |/dev/nul|l") opoi|
|000015f0| 6e 74 20 70 61 74 63 68 | 2d 6d 61 70 20 65 6e 64 |nt patch|-map end|
|00001600| 32 20 65 6e 64 31 20 62 | 65 67 32 20 62 65 67 31 |2 end1 b|eg2 beg1|
|00001610| 20 66 69 6c 65 6e 61 6d | 65 73 20 6d 61 72 6b 32 | filenam|es mark2|
|00001620| 20 6d 61 72 6b 32 2d 65 | 6e 64 20 70 6f 73 73 69 | mark2-e|nd possi|
|00001630| 62 6c 65 2d 66 69 6c 65 | 2d 6e 61 6d 65 73 20 6d |ble-file|-names m|
|00001640| 61 72 6b 31 2d 65 6e 64 | 20 6d 61 72 6b 31 20 63 |ark1-end| mark1 c|
|00001650| 6f 75 6e 74 20 72 65 2d | 73 65 61 72 63 68 2d 66 |ount re-|search-f|
|00001660| 6f 72 77 61 72 64 20 65 | 64 69 66 66 2d 63 6f 6e |orward e|diff-con|
|00001670| 74 65 78 74 2d 64 69 66 | 66 2d 6c 61 62 65 6c 2d |text-dif|f-label-|
|00001680| 72 65 67 65 78 70 20 74 | 20 31 20 32 20 34 20 33 |regexp t| 1 2 4 3|
|00001690| 20 35 20 22 2f 64 65 76 | 2f 6e 75 6c 6c 22 20 72 | 5 "/dev|/null" r|
|000016a0| 65 2d 73 65 61 72 63 68 | 2d 62 61 63 6b 77 61 72 |e-search|-backwar|
|000016b0| 64 20 22 5e 49 6e 64 65 | 78 3a 22 20 6e 6f 65 72 |d "^Inde|x:" noer|
|000016c0| 72 6f 72 20 22 5e 50 72 | 65 72 65 71 3a 22 20 70 |ror "^Pr|ereq:" p|
|000016d0| 6f 69 6e 74 2d 6d 61 78 | 2d 6d 61 72 6b 65 72 20 |oint-max|-marker |
|000016e0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 6d 61 70 20 |ediff-pa|tch-map |
|000016f0| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|00001700| 66 66 2d 71 75 69 74 20 | 65 72 72 6f 72 20 65 64 |ff-quit |error ed|
|00001710| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|00001720| 2d 42 55 46 46 45 52 5d | 20 31 34 5d 29 0a 28 64 |-BUFFER]| 14]).(d|
|00001730| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 66 |efalias |'ediff-f|
|00001740| 69 78 75 70 2d 70 61 74 | 63 68 2d 6d 61 70 20 23 |ixup-pat|ch-map #|
|00001750| 5b 28 66 69 6c 65 6e 61 | 6d 65 29 20 22 c0 09 21 |[(filena|me) "..!|
|00001760| 11 c2 09 21 ab 85 c3 09 | 21 aa 83 c4 09 21 c4 0d |...!....|!....!..|
|00001770| 40 40 40 21 c4 0d 40 40 | 41 21 1e 06 1e 07 1e 08 |@@@!..@@|A!......|
|00001780| c9 ca 0d 5c 22 88 c2 09 | 21 ac 90 cb 09 98 ac 8b |...\"...|!.......|
|00001790| 0d 40 cc 09 21 cc 09 21 | 42 a0 88 c9 cd 0d 5c 22 |.@..!..!|B.....\"|
|000017a0| 88 c9 ce 0d 5c 22 2b 87 | 22 20 5b 65 78 70 61 6e |....\"+.|" [expan|
|000017b0| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 66 69 6c 65 |d-file-n|ame file|
|000017c0| 6e 61 6d 65 20 66 69 6c | 65 2d 64 69 72 65 63 74 |name fil|e-direct|
|000017d0| 6f 72 79 2d 70 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |ory-p fi|le-name-|
|000017e0| 61 73 2d 64 69 72 65 63 | 74 6f 72 79 20 66 69 6c |as-direc|tory fil|
|000017f0| 65 2d 6e 61 6d 65 2d 64 | 69 72 65 63 74 6f 72 79 |e-name-d|irectory|
|00001800| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 6d 61 70 | ediff-p|atch-map|
|00001810| 20 62 61 73 65 2d 64 69 | 72 32 20 62 61 73 65 2d | base-di|r2 base-|
|00001820| 64 69 72 31 20 61 63 74 | 75 61 6c 2d 64 69 72 20 |dir1 act|ual-dir |
|00001830| 6d 61 70 63 61 72 20 23 | 5b 28 74 72 69 70 6c 65 |mapcar #|[(triple|
|00001840| 29 20 22 08 40 40 c1 98 | ac a3 08 40 08 40 40 5c |) ".@@..|...@.@@\|
|00001850| 6e 1b 1c c5 20 1e 06 c7 | 8e c8 c9 0b 50 0c 5c 22 |n... ...|....P.\"|
|00001860| ab 87 0c ca 95 cb 4f aa | 83 cc 0c 50 2c a0 88 08 |......O.|...P,...|
|00001870| 40 41 c1 98 ae a3 08 40 | 08 40 41 0e 0d 1b 1c c5 |@A.....@|.@A.....|
|00001880| 20 1e 06 c7 8e c8 c9 0b | 50 0c 5c 22 ab 87 0c ca | .......|P.\"....|
|00001890| 95 cb 4f aa 83 cc 0c 50 | 2c a1 87 22 20 5b 74 72 |..O....P|,.." [tr|
|000018a0| 69 70 6c 65 20 22 2f 64 | 65 76 2f 6e 75 6c 6c 22 |iple "/d|ev/null"|
|000018b0| 20 62 61 73 65 2d 64 69 | 72 31 20 70 72 65 66 69 | base-di|r1 prefi|
|000018c0| 78 20 66 69 6c 65 6e 61 | 6d 65 20 6d 61 74 63 68 |x filena|me match|
|000018d0| 2d 64 61 74 61 20 6d 61 | 74 63 68 2d 64 61 74 61 |-data ma|tch-data|
|000018e0| 20 28 28 73 74 6f 72 65 | 2d 6d 61 74 63 68 2d 64 | ((store|-match-d|
|000018f0| 61 74 61 20 6d 61 74 63 | 68 2d 64 61 74 61 29 29 |ata matc|h-data))|
|00001900| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 5e | string-|match "^|
|00001910| 22 20 30 20 6e 69 6c 20 | 22 2f 6e 75 6c 6c 2f 22 |" 0 nil |"/null/"|
|00001920| 20 62 61 73 65 2d 64 69 | 72 32 5d 20 34 5d 20 22 | base-di|r2] 4] "|
|00001930| 2f 64 65 76 2f 6e 75 6c | 6c 22 20 66 69 6c 65 2d |/dev/nul|l" file-|
|00001940| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|00001950| 79 20 23 5b 28 74 72 69 | 70 6c 65 29 20 22 c0 c1 |y #[(tri|ple) "..|
|00001960| 5c 6e 40 40 5c 22 ab d6 | c0 c1 5c 6e 40 41 5c 22 |\n@@\"..|..\n@A\"|
|00001970| ab ce 0b 90 c4 c5 c6 5c | 6e 40 40 c7 c8 4f 5c 6e |.......\|n@@..O\n|
|00001980| 40 41 c7 c8 4f 23 21 91 | 88 c9 c8 1e 5c 6e 1e 0b |@A..O#!.|....\n..|
|00001990| 0e 0b ab a7 cc cd 0e 0e | 89 c9 24 16 5c 6e cf 0e |........|..$.\n..|
|000019a0| 5c 6e 21 ac 86 c8 89 16 | 0b aa 69 c9 16 0b d0 20 |\n!.....|..i.... |
|000019b0| 88 d1 d2 0e 5c 6e 5c 22 | 88 d3 d4 21 88 aa 55 5c |....\n\"|...!..U\|
|000019c0| 6e 0e 5c 6e 89 42 a0 2a | 87 5c 6e 40 d5 0e 0e 5c |n.\n.B.*|.\n@...\|
|000019d0| 6e 40 40 50 21 a0 88 5c | 6e 40 d5 0e 0e 5c 6e 40 |n@@P!..\|n@...\n@|
|000019e0| 41 50 21 a1 87 22 20 5b | 73 74 72 69 6e 67 2d 6d |AP!.." [|string-m|
|000019f0| 61 74 63 68 20 22 5e 2f | 6e 75 6c 6c 2f 22 20 74 |atch "^/|null/" t|
|00001a00| 72 69 70 6c 65 20 65 64 | 69 66 66 2d 6d 73 67 2d |riple ed|iff-msg-|
|00001a10| 62 75 66 66 65 72 20 70 | 72 69 6e 63 20 66 6f 72 |buffer p|rinc for|
|00001a20| 6d 61 74 20 22 5c 6e 54 | 68 65 20 70 61 74 63 68 |mat "\nT|he patch|
|00001a30| 20 66 69 6c 65 20 63 6f | 6e 74 61 69 6e 73 20 61 | file co|ntains a|
|00001a40| 20 63 6f 6e 74 65 78 74 | 20 64 69 66 66 20 66 6f | context| diff fo|
|00001a50| 72 5c 6e 09 25 73 5c 6e | 09 25 73 5c 6e 48 6f 77 |r\n.%s\n|.%s\nHow|
|00001a60| 65 76 65 72 2c 20 45 64 | 69 66 66 20 63 61 6e 6e |ever, Ed|iff cann|
|00001a70| 6f 74 20 69 6e 66 65 72 | 20 74 68 65 20 6e 61 6d |ot infer| the nam|
|00001a80| 65 20 6f 66 20 74 68 65 | 20 61 63 74 75 61 6c 20 |e of the| actual |
|00001a90| 66 69 6c 65 5c 6e 74 6f | 20 62 65 20 70 61 74 63 |file\nto| be patc|
|00001aa0| 68 65 64 20 6f 6e 20 79 | 6f 75 72 20 73 79 73 74 |hed on y|our syst|
|00001ab0| 65 6d 2e 20 49 66 20 79 | 6f 75 20 6b 6e 6f 77 20 |em. If y|ou know |
|00001ac0| 74 68 65 20 63 6f 72 72 | 65 63 74 20 66 69 6c 65 |the corr|ect file|
|00001ad0| 20 6e 61 6d 65 2c 5c 6e | 70 6c 65 61 73 65 20 65 | name,\n|please e|
|00001ae0| 6e 74 65 72 20 69 74 20 | 6e 6f 77 2e 5c 6e 5c 6e |nter it |now.\n\n|
|00001af0| 49 66 20 79 6f 75 20 64 | 6f 6e 27 74 20 6b 6e 6f |If you d|on't kno|
|00001b00| 77 20 61 6e 64 20 73 74 | 69 6c 6c 20 77 6f 75 6c |w and st|ill woul|
|00001b10| 64 20 6c 69 6b 65 20 74 | 6f 20 61 70 70 6c 79 20 |d like t|o apply |
|00001b20| 70 61 74 63 68 65 73 20 | 74 6f 5c 6e 6f 74 68 65 |patches |to\nothe|
|00001b30| 72 20 66 69 6c 65 73 2c | 20 65 6e 74 65 72 20 2f |r files,| enter /|
|00001b40| 64 65 76 2f 6e 75 6c 6c | 5c 6e 22 20 36 20 6e 69 |dev/null|\n" 6 ni|
|00001b50| 6c 20 74 20 75 73 65 72 | 2d 66 69 6c 65 20 64 69 |l t user|-file di|
|00001b60| 72 65 63 74 6f 72 79 20 | 72 65 61 64 2d 66 69 6c |rectory |read-fil|
|00001b70| 65 2d 6e 61 6d 65 20 22 | 50 6c 65 61 73 65 20 65 |e-name "|Please e|
|00001b80| 6e 74 65 72 20 66 69 6c | 65 20 6e 61 6d 65 3a 20 |nter fil|e name: |
|00001b90| 22 20 61 63 74 75 61 6c | 2d 64 69 72 20 66 69 6c |" actual|-dir fil|
|00001ba0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 62 65 |e-direct|ory-p be|
|00001bb0| 65 70 20 6d 65 73 73 61 | 67 65 20 22 25 73 20 69 |ep messa|ge "%s i|
|00001bc0| 73 20 61 20 64 69 72 65 | 63 74 6f 72 79 22 20 73 |s a dire|ctory" s|
|00001bd0| 69 74 2d 66 6f 72 20 32 | 20 65 78 70 61 6e 64 2d |it-for 2| expand-|
|00001be0| 66 69 6c 65 2d 6e 61 6d | 65 5d 20 39 5d 20 23 5b |file-nam|e] 9] #[|
|00001bf0| 28 74 72 69 70 6c 65 29 | 20 22 08 40 40 19 08 40 |(triple)| ".@@..@|
|00001c00| 41 1a c3 09 21 1c c3 5c | 6e 21 1d 5c 6e 47 09 47 |A...!..\|n!.\nG.G|
|00001c10| 57 ab 89 0d ab 86 08 5c | 6e a0 82 ca 00 09 47 5c |W......\|n.....G\|
|00001c20| 6e 47 57 ab 89 0c ab 86 | 08 09 a0 82 ca 00 0c ab |nGW.....|........|
|00001c30| 8e 0d ab 8b 09 5c 6e 98 | ab 86 08 09 a0 82 ca 00 |.....\n.|........|
|00001c40| 0c ab a1 0d ab 9e 0e 06 | 90 c7 c8 c9 09 5c 6e 89 |........|.....\n.|
|00001c50| 09 25 21 91 88 08 ca c8 | cb 5c 6e 5c 22 21 ab 83 |.%!.....|.\n\"!..|
|00001c60| 5c 6e aa 81 09 a0 aa e5 | 0d ab 85 08 5c 6e a0 aa |\n......|....\n..|
|00001c70| dd 0c ab 85 08 09 a0 aa | d5 0e 06 90 c7 cc 21 88 |........|......!.|
|00001c80| 09 5c 6e 98 ab 89 c7 c8 | cd 09 5c 22 21 88 aa 88 |.\n.....|..\"!...|
|00001c90| c7 c8 ce 09 5c 6e 23 21 | 88 c7 cf 21 91 88 d0 d1 |....\n#!|...!....|
|00001ca0| 1e 12 1e 13 0e 13 ab a4 | d4 d5 0e 16 89 d0 24 16 |........|......$.|
|00001cb0| 12 d7 0e 12 21 ac 86 d1 | 89 16 13 aa 69 d8 20 88 |....!...|....i. .|
|00001cc0| d9 da 0e 12 5c 22 88 db | dc 21 88 aa 58 08 0e 12 |....\"..|.!..X...|
|00001cd0| a0 2a 2c 87 22 20 5b 74 | 72 69 70 6c 65 20 66 69 |.*,." [t|riple fi|
|00001ce0| 6c 65 31 20 66 69 6c 65 | 32 20 66 69 6c 65 2d 65 |le1 file|2 file-e|
|00001cf0| 78 69 73 74 73 2d 70 20 | 66 31 2d 65 78 69 73 74 |xists-p |f1-exist|
|00001d00| 73 20 66 32 2d 65 78 69 | 73 74 73 20 65 64 69 66 |s f2-exi|sts edif|
|00001d10| 66 2d 6d 73 67 2d 62 75 | 66 66 65 72 20 70 72 69 |f-msg-bu|ffer pri|
|00001d20| 6e 63 20 66 6f 72 6d 61 | 74 20 22 5c 6e 45 64 69 |nc forma|t "\nEdi|
|00001d30| 66 66 20 68 61 73 20 69 | 6e 66 65 72 72 65 64 20 |ff has i|nferred |
|00001d40| 74 68 61 74 5c 6e 09 25 | 73 5c 6e 09 25 73 5c 6e |that\n.%|s\n.%s\n|
|00001d50| 61 72 65 20 74 77 6f 20 | 70 6f 73 73 69 62 6c 65 |are two |possible|
|00001d60| 20 74 61 72 67 65 74 73 | 20 66 6f 72 20 61 70 70 | targets| for app|
|00001d70| 6c 79 69 6e 67 20 74 68 | 65 20 70 61 74 63 68 2e |lying th|e patch.|
|00001d80| 5c 6e 42 6f 74 68 20 66 | 69 6c 65 73 20 73 65 65 |\nBoth f|iles see|
|00001d90| 6d 20 74 6f 20 62 65 20 | 70 6c 61 75 73 69 62 6c |m to be |plausibl|
|00001da0| 65 20 61 6c 74 65 72 6e | 61 74 69 76 65 73 2e 5c |e altern|atives.\|
|00001db0| 6e 5c 6e 50 6c 65 61 73 | 65 20 61 64 76 69 63 65 |n\nPleas|e advice|
|00001dc0| 3a 5c 6e 20 20 20 20 54 | 79 70 65 20 60 79 27 20 |:\n T|ype `y' |
|00001dd0| 74 6f 20 75 73 65 20 25 | 73 20 61 73 20 74 68 65 |to use %|s as the|
|00001de0| 20 74 61 72 67 65 74 3b | 5c 6e 20 20 20 20 54 79 | target;|\n Ty|
|00001df0| 70 65 20 60 6e 27 20 74 | 6f 20 75 73 65 20 25 73 |pe `n' t|o use %s|
|00001e00| 20 61 73 20 74 68 65 20 | 74 61 72 67 65 74 2e 5c | as the |target.\|
|00001e10| 6e 22 20 79 2d 6f 72 2d | 6e 2d 70 20 22 55 73 65 |n" y-or-|n-p "Use|
|00001e20| 20 25 73 20 3f 20 22 20 | 22 5c 6e 45 64 69 66 66 | %s ? " |"\nEdiff|
|00001e30| 20 68 61 73 20 69 6e 66 | 65 72 72 65 64 20 74 68 | has inf|erred th|
|00001e40| 61 74 22 20 22 5c 6e 09 | 25 73 5c 6e 69 73 20 74 |at" "\n.|%s\nis t|
|00001e50| 68 65 20 74 61 72 67 65 | 74 20 66 6f 72 20 74 68 |he targe|t for th|
|00001e60| 69 73 20 70 61 74 63 68 | 2e 20 48 6f 77 65 76 65 |is patch|. Howeve|
|00001e70| 72 2c 20 74 68 69 73 20 | 66 69 6c 65 20 64 6f 65 |r, this |file doe|
|00001e80| 73 20 6e 6f 74 20 65 78 | 69 73 74 2e 22 20 22 5c |s not ex|ist." "\|
|00001e90| 6e 09 25 73 5c 6e 09 25 | 73 5c 6e 61 72 65 20 74 |n.%s\n.%|s\nare t|
|00001ea0| 77 6f 20 70 6f 73 73 69 | 62 6c 65 20 74 61 72 67 |wo possi|ble targ|
|00001eb0| 65 74 73 20 66 6f 72 20 | 74 68 69 73 20 70 61 74 |ets for |this pat|
|00001ec0| 63 68 2e 20 48 6f 77 65 | 76 65 72 2c 20 74 68 65 |ch. Howe|ver, the|
|00001ed0| 73 65 20 66 69 6c 65 73 | 20 64 6f 20 6e 6f 74 20 |se files| do not |
|00001ee0| 65 78 69 73 74 2e 22 20 | 22 5c 6e 5c 6e 50 6c 65 |exist." |"\n\nPle|
|00001ef0| 61 73 65 20 65 6e 74 65 | 72 20 61 6e 20 61 6c 74 |ase ente|r an alt|
|00001f00| 65 72 6e 61 74 69 76 65 | 20 70 61 74 63 68 20 74 |ernative| patch t|
|00001f10| 61 72 67 65 74 20 2e 2e | 2e 5c 6e 22 20 74 20 6e |arget ..|.\n" t n|
|00001f20| 69 6c 20 74 61 72 67 65 | 74 20 64 69 72 65 63 74 |il targe|t direct|
|00001f30| 6f 72 79 20 72 65 61 64 | 2d 66 69 6c 65 2d 6e 61 |ory read|-file-na|
|00001f40| 6d 65 20 22 50 6c 65 61 | 73 65 20 65 6e 74 65 72 |me "Plea|se enter|
|00001f50| 20 61 20 70 61 74 63 68 | 20 74 61 72 67 65 74 3a | a patch| target:|
|00001f60| 20 22 20 61 63 74 75 61 | 6c 2d 64 69 72 20 66 69 | " actua|l-dir fi|
|00001f70| 6c 65 2d 64 69 72 65 63 | 74 6f 72 79 2d 70 20 62 |le-direc|tory-p b|
|00001f80| 65 65 70 20 6d 65 73 73 | 61 67 65 20 22 25 73 20 |eep mess|age "%s |
|00001f90| 69 73 20 61 20 64 69 72 | 65 63 74 6f 72 79 22 20 |is a dir|ectory" |
|00001fa0| 73 69 74 2d 66 6f 72 20 | 32 5d 20 39 5d 5d 20 34 |sit-for |2] 9]] 4|
|00001fb0| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00001fc0| 69 66 66 2d 73 68 6f 77 | 2d 70 61 74 63 68 2d 64 |iff-show|-patch-d|
|00001fd0| 69 61 67 6e 6f 73 74 69 | 63 73 20 23 5b 6e 69 6c |iagnosti|cs #[nil|
|00001fe0| 20 22 c0 09 21 ab 85 c2 | 09 0b 5c 22 87 c0 0c 21 | "..!...|..\"...!|
|00001ff0| ab 85 c2 0c 0b 5c 22 87 | c5 0b c6 5c 22 87 22 20 |.....\".|...\"." |
|00002000| 5b 77 69 6e 64 6f 77 2d | 6c 69 76 65 2d 70 20 65 |[window-|live-p e|
|00002010| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 41 20 73 65 |diff-win|dow-A se|
|00002020| 74 2d 77 69 6e 64 6f 77 | 2d 62 75 66 66 65 72 20 |t-window|-buffer |
|00002030| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 64 69 61 67 |ediff-pa|tch-diag|
|00002040| 6e 6f 73 74 69 63 73 20 | 65 64 69 66 66 2d 77 69 |nostics |ediff-wi|
|00002050| 6e 64 6f 77 2d 42 20 64 | 69 73 70 6c 61 79 2d 62 |ndow-B d|isplay-b|
|00002060| 75 66 66 65 72 20 6e 6f | 74 2d 74 68 69 73 2d 77 |uffer no|t-this-w|
|00002070| 69 6e 64 6f 77 5d 20 33 | 20 6e 69 6c 20 6e 69 6c |indow] 3| nil nil|
|00002080| 5d 29 0a 23 40 31 30 36 | 20 4f 62 74 61 69 6e 20 |]).#@106| Obtain |
|00002090| 70 61 74 63 68 20 62 75 | 66 66 65 72 2e 20 20 49 |patch bu|ffer. I|
|000020a0| 66 20 70 61 74 63 68 20 | 69 73 20 61 6c 72 65 61 |f patch |is alrea|
|000020b0| 64 79 20 69 6e 20 61 20 | 62 75 66 66 65 72 2d 2d |dy in a |buffer--|
|000020c0| 2d 75 73 65 20 69 74 2e | 0a 45 6c 73 65 2c 20 72 |-use it.|.Else, r|
|000020d0| 65 61 64 20 70 61 74 63 | 68 20 66 69 6c 65 20 69 |ead patc|h file i|
|000020e0| 6e 74 6f 20 61 20 6e 65 | 77 20 62 75 66 66 65 72 |nto a ne|w buffer|
|000020f0| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00002100| 69 66 66 2d 67 65 74 2d | 70 61 74 63 68 2d 62 75 |iff-get-|patch-bu|
|00002110| 66 66 65 72 20 23 5b 6e | 69 6c 20 22 08 ae 87 09 |ffer #[n|il "....|
|00002120| ab 83 5c 6e aa 81 0b c4 | 1d 1e 06 c7 c4 1e 08 1e |..\n....|........|
|00002130| 09 ca cb 21 2a ab 98 cc | cd ce cf d0 d1 20 21 d1 |...!*...|..... !.|
|00002140| 20 61 ab 83 d2 aa 81 70 | 21 d3 23 21 15 aa 8a d4 | a.....p|!.#!....|
|00002150| d5 d6 0e 06 c4 d3 24 21 | 15 0d ab a5 cc 0d 21 ab |......$!|......!.|
|00002160| a0 d7 cc 0d 21 21 ab 99 | 72 0d 71 88 65 62 88 d8 |....!!..|r.q.eb..|
|00002170| 0d 21 ac 8a d9 0d da 5c | 22 88 db dc 20 21 88 29 |.!.....\|"... !.)|
|00002180| aa 8b 0e 1d de 61 ac 85 | df 0e 20 21 88 e1 0d 21 |.....a..|.. !...!|
|00002190| 88 0d 2a 87 22 20 5b 65 | 64 69 66 66 2d 70 61 74 |..*." [e|diff-pat|
|000021a0| 63 68 2d 64 65 66 61 75 | 6c 74 2d 64 69 72 65 63 |ch-defau|lt-direc|
|000021b0| 74 6f 72 79 20 65 64 69 | 66 66 2d 75 73 65 2d 6c |tory edi|ff-use-l|
|000021c0| 61 73 74 2d 64 69 72 20 | 65 64 69 66 66 2d 6c 61 |ast-dir |ediff-la|
|000021d0| 73 74 2d 64 69 72 2d 70 | 61 74 63 68 20 64 65 66 |st-dir-p|atch def|
|000021e0| 61 75 6c 74 2d 64 69 72 | 65 63 74 6f 72 79 20 6e |ault-dir|ectory n|
|000021f0| 69 6c 20 70 61 74 63 68 | 2d 62 75 66 20 64 69 72 |il patch|-buf dir|
|00002200| 20 74 20 6c 61 73 74 2d | 63 6f 6d 6d 61 6e 64 2d | t last-|command-|
|00002210| 65 76 65 6e 74 20 6c 61 | 73 74 2d 6e 6f 6e 6d 65 |event la|st-nonme|
|00002220| 6e 75 2d 65 76 65 6e 74 | 20 79 2d 6f 72 2d 6e 2d |nu-event| y-or-n-|
|00002230| 70 20 22 49 73 20 74 68 | 65 20 70 61 74 63 68 20 |p "Is th|e patch |
|00002240| 61 6c 72 65 61 64 79 20 | 69 6e 20 61 20 62 75 66 |already |in a buf|
|00002250| 66 65 72 3f 20 22 20 67 | 65 74 2d 62 75 66 66 65 |fer? " g|et-buffe|
|00002260| 72 20 72 65 61 64 2d 62 | 75 66 66 65 72 20 22 57 |r read-b|uffer "W|
|00002270| 68 69 63 68 20 62 75 66 | 66 65 72 20 63 6f 6e 74 |hich buf|fer cont|
|00002280| 61 69 6e 73 20 74 68 65 | 20 70 61 74 63 68 3f 20 |ains the| patch? |
|00002290| 22 20 65 64 69 66 66 2d | 6f 74 68 65 72 2d 62 75 |" ediff-|other-bu|
|000022a0| 66 66 65 72 20 6e 65 78 | 74 2d 77 69 6e 64 6f 77 |ffer nex|t-window|
|000022b0| 20 73 65 6c 65 63 74 65 | 64 2d 77 69 6e 64 6f 77 | selecte|d-window|
|000022c0| 20 22 22 20 6d 75 73 74 | 2d 6d 61 74 63 68 20 66 | "" must|-match f|
|000022d0| 69 6e 64 2d 66 69 6c 65 | 2d 6e 6f 73 65 6c 65 63 |ind-file|-noselec|
|000022e0| 74 20 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |t read-f|ile-name|
|000022f0| 20 22 57 68 69 63 68 20 | 66 69 6c 65 20 63 6f 6e | "Which |file con|
|00002300| 74 61 69 6e 73 20 74 68 | 65 20 70 61 74 63 68 3f |tains th|e patch?|
|00002310| 20 22 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 65 | " buffe|r-name e|
|00002320| 64 69 66 66 2d 67 65 74 | 2d 76 69 73 69 62 6c 65 |diff-get|-visible|
|00002330| 2d 62 75 66 66 65 72 2d | 77 69 6e 64 6f 77 20 70 |-buffer-|window p|
|00002340| 6f 70 2d 74 6f 2d 62 75 | 66 66 65 72 20 6f 74 68 |op-to-bu|ffer oth|
|00002350| 65 72 2d 77 69 6e 64 6f | 77 20 73 65 6c 65 63 74 |er-windo|w select|
|00002360| 2d 77 69 6e 64 6f 77 20 | 70 72 65 76 69 6f 75 73 |-window |previous|
|00002370| 2d 77 69 6e 64 6f 77 20 | 74 68 69 73 2d 63 6f 6d |-window |this-com|
|00002380| 6d 61 6e 64 20 65 64 69 | 66 66 2d 71 75 69 74 20 |mand edi|ff-quit |
|00002390| 65 72 72 6f 72 20 65 64 | 69 66 66 2d 4b 49 4c 4c |error ed|iff-KILL|
|000023a0| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 20 |ED-VITAL|-BUFFER |
|000023b0| 65 64 69 66 66 2d 6d 61 | 70 2d 70 61 74 63 68 2d |ediff-ma|p-patch-|
|000023c0| 62 75 66 66 65 72 5d 20 | 36 20 28 23 24 20 2e 20 |buffer] |6 (#$ . |
|000023d0| 38 33 32 39 29 5d 29 0a | 28 64 65 66 61 6c 69 61 |8329)]).|(defalia|
|000023e0| 73 20 27 65 64 69 66 66 | 2d 64 69 73 70 61 74 63 |s 'ediff|-dispatc|
|000023f0| 68 2d 66 69 6c 65 2d 70 | 61 74 63 68 69 6e 67 2d |h-file-p|atching-|
|00002400| 6a 6f 62 20 23 5b 28 70 | 61 74 63 68 2d 62 75 66 |job #[(p|atch-buf|
|00002410| 20 66 69 6c 65 6e 61 6d | 65 20 26 6f 70 74 69 6f | filenam|e &optio|
|00002420| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00002430| 73 29 20 22 08 ab be c1 | 08 21 ab b9 c2 c1 08 21 |s) "....|.!.....!|
|00002440| 21 ab b2 72 08 71 88 c3 | 0c 21 88 0d 47 c6 57 ab |!..r.q..|.!..G.W.|
|00002450| 9d c7 08 c8 c9 0d 40 40 | 5c 22 ac 8d 0d 40 40 47 |......@@|\"...@@G|
|00002460| ca 56 ab 85 0d 40 40 aa | 81 0c 0e 0b 23 aa 85 cc |.V...@@.|....#...|
|00002470| 08 0e 0b 5c 22 29 87 0e | 0d ce 61 ae 84 cf 0e 10 |...\")..|..a.....|
|00002480| 21 87 22 20 5b 70 61 74 | 63 68 2d 62 75 66 20 67 |!." [pat|ch-buf g|
|00002490| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|000024a0| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 66 69 78 75 |-name ed|iff-fixu|
|000024b0| 70 2d 70 61 74 63 68 2d | 6d 61 70 20 66 69 6c 65 |p-patch-|map file|
|000024c0| 6e 61 6d 65 20 65 64 69 | 66 66 2d 70 61 74 63 68 |name edi|ff-patch|
|000024d0| 2d 6d 61 70 20 32 20 65 | 64 69 66 66 2d 70 61 74 |-map 2 e|diff-pat|
|000024e0| 63 68 2d 66 69 6c 65 2d | 69 6e 74 65 72 6e 61 6c |ch-file-|internal|
|000024f0| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 5e | string-|match "^|
|00002500| 2f 64 65 76 2f 6e 75 6c | 6c 22 20 31 20 73 74 61 |/dev/nul|l" 1 sta|
|00002510| 72 74 75 70 2d 68 6f 6f | 6b 73 20 65 64 69 66 66 |rtup-hoo|ks ediff|
|00002520| 2d 6d 75 6c 74 69 2d 70 | 61 74 63 68 2d 69 6e 74 |-multi-p|atch-int|
|00002530| 65 72 6e 61 6c 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |ernal th|is-comma|
|00002540| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00002550| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00002560| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 5d 20 35 |-VITAL-B|UFFER] 5|
|00002570| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00002580| 69 66 66 2d 70 61 74 63 | 68 2d 62 75 66 66 65 72 |iff-patc|h-buffer|
|00002590| 2d 69 6e 74 65 72 6e 61 | 6c 20 23 5b 28 70 61 74 |-interna|l #[(pat|
|000025a0| 63 68 2d 62 75 66 20 62 | 75 66 2d 74 6f 2d 70 61 |ch-buf b|uf-to-pa|
|000025b0| 74 63 68 2d 6e 61 6d 65 | 20 26 6f 70 74 69 6f 6e |tch-name| &option|
|000025c0| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|000025d0| 29 20 22 c0 09 21 89 1a | ad 83 c3 5c 6e 21 1c c5 |) "..!..|...\n!..|
|000025e0| 5c 6e 21 1e 06 0e 07 ab | 98 c0 0e 07 21 ab 92 c8 |\n!.....|....!...|
|000025f0| c0 0e 07 21 21 ab 8a 72 | 0e 07 71 88 0e 09 29 aa |...!!..r|..q...).|
|00002600| 8a 0e 5c 6e cb 61 ae 84 | cc 0e 0d 21 47 ce 56 1e |..\n.a..|...!G.V.|
|00002610| 0f d0 1e 11 d0 1e 12 d0 | 1e 13 0e 0f ab 84 cc d4 |........|........|
|00002620| 21 88 5c 6e ab b6 c0 5c | 6e 21 ab b1 c8 c0 5c 6e |!.\n...\|n!....\n|
|00002630| 21 21 ab aa 72 5c 6e 71 | 88 0e 15 16 11 d6 5c 6e |!!..r\nq|......\n|
|00002640| 21 16 12 d7 0e 12 21 88 | 0c ac 83 d0 16 18 d9 09 |!.....!.|........|
|00002650| 21 88 da d0 21 88 db 20 | 88 0e 11 16 15 29 aa 8b |!...!.. |.....)..|
|00002660| 0e 5c 6e cb 61 ac 85 cc | 0e 0d 21 88 dc 0e 07 0e |.\n.a...|..!.....|
|00002670| 12 0e 1d 23 89 16 13 83 | 3d 01 c0 0e 13 21 83 3d |...#....|=....!.=|
|00002680| 01 c8 c0 0e 13 21 21 83 | 3d 01 72 0e 13 71 88 de |.....!!.|=.r..q..|
|00002690| c3 0e 1f 21 21 88 de c3 | 0e 20 21 21 88 0e 1f ab |...!!...|. !!....|
|000026a0| ab c0 0e 1f 21 ab a5 c8 | c0 0e 1f 21 21 ab 9d 72 |....!...|...!!..r|
|000026b0| 0e 1f 71 88 0e 11 ab 84 | 0e 11 16 15 d7 0c 21 88 |..q.....|......!.|
|000026c0| d9 09 21 88 da 0e 06 21 | 88 29 aa 8b 0e 5c 6e cb |..!....!|.)...\n.|
|000026d0| 61 ac 85 cc 0e 0d 21 88 | 0e 20 ab b1 c0 0e 20 21 |a.....!.|. .... !|
|000026e0| ab ab c8 c0 0e 20 21 21 | ab a3 72 0e 20 71 88 d0 |..... !!|..r. q..|
|000026f0| 16 18 0e 11 ab 84 0e 11 | 16 15 d7 d0 21 88 d9 e1 |........|....!...|
|00002700| 09 e2 50 e3 5c 22 21 88 | da e4 21 29 aa 8a 0e 5c |..P.\"!.|..!)...\|
|00002710| 6e cb 61 ae 84 cc 0e 0d | 21 29 aa 8a 0e 5c 6e cb |n.a.....|!)...\n.|
|00002720| 61 ae 84 cc 0e 0d 21 2e | 07 87 22 20 5b 67 65 74 |a.....!.|.." [get|
|00002730| 2d 62 75 66 66 65 72 20 | 62 75 66 2d 74 6f 2d 70 |-buffer |buf-to-p|
|00002740| 61 74 63 68 2d 6e 61 6d | 65 20 62 75 66 2d 74 6f |atch-nam|e buf-to|
|00002750| 2d 70 61 74 63 68 20 62 | 75 66 66 65 72 2d 66 69 |-patch b|uffer-fi|
|00002760| 6c 65 2d 6e 61 6d 65 20 | 76 69 73 69 74 65 64 2d |le-name |visited-|
|00002770| 66 69 6c 65 20 62 75 66 | 66 65 72 2d 6d 6f 64 69 |file buf|fer-modi|
|00002780| 66 69 65 64 2d 70 20 62 | 75 66 2d 6d 6f 64 2d 73 |fied-p b|uf-mod-s|
|00002790| 74 61 74 75 73 20 70 61 | 74 63 68 2d 62 75 66 20 |tatus pa|tch-buf |
|000027a0| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 65 64 69 66 |buffer-n|ame edif|
|000027b0| 66 2d 70 61 74 63 68 2d | 6d 61 70 20 74 68 69 73 |f-patch-|map this|
|000027c0| 2d 63 6f 6d 6d 61 6e 64 | 20 65 64 69 66 66 2d 71 |-command| ediff-q|
|000027d0| 75 69 74 20 65 72 72 6f | 72 20 65 64 69 66 66 2d |uit erro|r ediff-|
|000027e0| 4b 49 4c 4c 45 44 2d 56 | 49 54 41 4c 2d 42 55 46 |KILLED-V|ITAL-BUF|
|000027f0| 46 45 52 20 31 20 6d 75 | 6c 74 69 66 69 6c 65 2d |FER 1 mu|ltifile-|
|00002800| 70 61 74 63 68 2d 70 20 | 6e 69 6c 20 64 65 66 61 |patch-p |nil defa|
|00002810| 75 6c 74 2d 64 69 72 20 | 66 69 6c 65 2d 6e 61 6d |ult-dir |file-nam|
|00002820| 65 20 63 74 6c 2d 62 75 | 66 20 22 43 61 6e 27 74 |e ctl-bu|f "Can't|
|00002830| 20 61 70 70 6c 79 20 6d | 75 6c 74 69 2d 66 69 6c | apply m|ulti-fil|
|00002840| 65 20 70 61 74 63 68 65 | 73 20 74 6f 20 62 75 66 |e patche|s to buf|
|00002850| 66 65 72 73 20 74 68 61 | 74 20 76 69 73 69 74 20 |fers tha|t visit |
|00002860| 6e 6f 20 66 69 6c 65 73 | 22 20 64 65 66 61 75 6c |no files|" defaul|
|00002870| 74 2d 64 69 72 65 63 74 | 6f 72 79 20 65 64 69 66 |t-direct|ory edif|
|00002880| 66 2d 6d 61 6b 65 2d 74 | 65 6d 70 2d 66 69 6c 65 |f-make-t|emp-file|
|00002890| 20 73 65 74 2d 76 69 73 | 69 74 65 64 2d 66 69 6c | set-vis|ited-fil|
|000028a0| 65 2d 6e 61 6d 65 20 62 | 75 66 66 65 72 2d 61 75 |e-name b|uffer-au|
|000028b0| 74 6f 2d 73 61 76 65 2d | 66 69 6c 65 2d 6e 61 6d |to-save-|file-nam|
|000028c0| 65 20 72 65 6e 61 6d 65 | 2d 62 75 66 66 65 72 20 |e rename|-buffer |
|000028d0| 73 65 74 2d 62 75 66 66 | 65 72 2d 6d 6f 64 69 66 |set-buff|er-modif|
|000028e0| 69 65 64 2d 70 20 73 65 | 74 2d 76 69 73 69 74 65 |ied-p se|t-visite|
|000028f0| 64 2d 66 69 6c 65 2d 6d | 6f 64 74 69 6d 65 20 65 |d-file-m|odtime e|
|00002900| 64 69 66 66 2d 64 69 73 | 70 61 74 63 68 2d 66 69 |diff-dis|patch-fi|
|00002910| 6c 65 2d 70 61 74 63 68 | 69 6e 67 2d 6a 6f 62 20 |le-patch|ing-job |
|00002920| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 64 65 |startup-|hooks de|
|00002930| 6c 65 74 65 2d 66 69 6c | 65 20 65 64 69 66 66 2d |lete-fil|e ediff-|
|00002940| 62 75 66 66 65 72 2d 41 | 20 65 64 69 66 66 2d 62 |buffer-A| ediff-b|
|00002950| 75 66 66 65 72 2d 42 20 | 65 64 69 66 66 2d 75 6e |uffer-B |ediff-un|
|00002960| 69 71 75 65 2d 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ique-buf|fer-name|
|00002970| 20 22 5f 70 61 74 63 68 | 65 64 22 20 22 22 20 74 | "_patch|ed" "" t|
|00002980| 5d 20 35 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 5]).(d|efalias |
|00002990| 27 65 64 69 66 66 2d 70 | 61 74 63 68 2d 72 65 74 |'ediff-p|atch-ret|
|000029a0| 75 72 6e 2d 63 6f 64 65 | 2d 6f 6b 20 23 5b 28 63 |urn-code|-ok #[(c|
|000029b0| 6f 64 65 29 20 22 08 c1 | 61 87 22 20 5b 63 6f 64 |ode) "..|a." [cod|
|000029c0| 65 20 30 5d 20 32 5d 29 | 0a 28 64 65 66 61 6c 69 |e 0] 2])|.(defali|
|000029d0| 61 73 20 27 65 64 69 66 | 66 2d 70 61 74 63 68 2d |as 'edif|f-patch-|
|000029e0| 66 69 6c 65 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |file-int|ernal #[|
|000029f0| 28 70 61 74 63 68 2d 62 | 75 66 20 73 6f 75 72 63 |(patch-b|uf sourc|
|00002a00| 65 2d 66 69 6c 65 6e 61 | 6d 65 20 26 6f 70 74 69 |e-filena|me &opti|
|00002a10| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|00002a20| 6b 73 29 20 22 c0 09 21 | 11 5c 6e 1b c4 c5 21 1e |ks) "..!|.\n...!.|
|00002a30| 06 09 1e 07 09 1e 08 c9 | 1e 5c 6e c9 1e 0b c9 1e |........|.\n.....|
|00002a40| 0c c9 1e 0d c9 1e 0e c9 | 1e 0f c9 1e 10 d1 d2 0e |........|........|
|00002a50| 13 5c 22 ab 84 d4 d5 21 | 88 d6 c7 cb d7 d8 24 88 |.\"....!|......$.|
|00002a60| d9 0e 07 21 d9 09 21 6b | 3f 16 0c da 0e 0b 21 88 |...!..!k|?.....!.|
|00002a70| 0e 06 ab c9 db 0e 06 21 | ab c3 dc db 0e 06 21 21 |.......!|......!!|
|00002a80| ab bb 72 0e 06 71 88 dd | 0e 1e 21 88 df e0 21 88 |..r..q..|..!...!.|
|00002a90| e1 e2 21 16 0f e3 e2 c9 | 5c 22 88 e4 65 64 0b e5 |..!.....|\"..ed..|
|00002aa0| 89 c9 0e 26 e7 e8 0e 29 | 0e 13 0e 2a c0 0e 07 21 |...&...)|...*...!|
|00002ab0| 25 26 08 16 0d e3 e2 0e | 0f 5c 22 88 29 aa 8b 0e |%&......|.\".)...|
|00002ac0| 2b ec 61 ac 85 d4 0e 2d | 21 88 df ee 21 88 df ef |+.a....-|!...!...|
|00002ad0| 21 88 f0 0e 06 21 88 f1 | f2 21 88 f3 0e 0d 21 ab |!....!..|.!....!.|
|00002ae0| 89 f4 0e 07 0e 35 50 21 | ac b2 0e 36 90 f7 e7 f8 |.....5P!|...6....|
|00002af0| 0e 29 89 0e 13 0e 35 0e | 2a 26 06 21 91 88 f9 fa |.)....5.|*&.!....|
|00002b00| 21 88 fb 0e 36 21 89 16 | 10 ab 88 fc 0e 10 21 88 |!...6!..|......!.|
|00002b10| 64 62 88 fd 0e 06 21 88 | d4 fe 21 88 0e 0c ac b4 |db....!.|..!.....|
|00002b20| 0e 0b ab a3 db 0e 0b 21 | ab 9d dc db 0e 0b 21 21 |.......!|......!!|
|00002b30| ab 95 72 0e 0b 71 88 ff | 09 0e 35 50 21 88 81 40 |..r..q..|..5P!..@|
|00002b40| 00 c9 21 88 29 aa b8 0e | 2b ec 61 ac b2 d4 0e 2d |..!.)...|+.a....-|
|00002b50| 21 88 aa ab 81 41 00 d9 | 09 21 21 ab 84 0e 07 aa |!....A..|.!!.....|
|00002b60| 81 09 81 42 00 50 16 08 | 81 43 00 0e 07 0e 08 e5 |...B.P..|.C......|
|00002b70| 23 88 81 43 00 0e 07 0e | 35 50 0e 07 e5 23 88 81 |#..C....|5P...#..|
|00002b80| 44 00 0e 18 42 16 18 81 | 45 00 0e 08 21 16 5c 6e |D...B...|E...!.\n|
|00002b90| 81 46 00 0e 0b 0e 5c 6e | c9 0e 18 81 47 00 25 89 |.F....\n|....G.%.|
|00002ba0| 16 0e ab 9e db 0e 0e 21 | ab 98 dc db 0e 0e 21 21 |.......!|......!!|
|00002bb0| ab 90 72 0e 0e 71 88 0e | 1e 16 48 0e 06 16 49 29 |..r..q..|..H...I)|
|00002bc0| aa 8b 0e 2b ec 61 ac 85 | d4 0e 2d 21 88 81 4a 00 |...+.a..|..-!..J.|
|00002bd0| 0e 06 21 88 df 81 4b 00 | 21 88 0e 0e 2e 0b 87 22 |..!...K.|!......"|
|00002be0| 20 5b 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 | [expand|-file-na|
|00002bf0| 6d 65 20 73 6f 75 72 63 | 65 2d 66 69 6c 65 6e 61 |me sourc|e-filena|
|00002c00| 6d 65 20 65 64 69 66 66 | 2d 73 68 65 6c 6c 20 73 |me ediff|-shell s|
|00002c10| 68 65 6c 6c 2d 66 69 6c | 65 2d 6e 61 6d 65 20 67 |hell-fil|e-name g|
|00002c20| 65 74 2d 62 75 66 66 65 | 72 2d 63 72 65 61 74 65 |et-buffe|r-create|
|00002c30| 20 22 2a 65 64 69 66 66 | 20 70 61 74 63 68 20 64 | "*ediff| patch d|
|00002c40| 69 61 67 6e 6f 73 74 69 | 63 73 2a 22 20 70 61 74 |iagnosti|cs*" pat|
|00002c50| 63 68 2d 64 69 61 67 6e | 6f 73 74 69 63 73 20 74 |ch-diagn|ostics t|
|00002c60| 72 75 65 2d 73 6f 75 72 | 63 65 2d 66 69 6c 65 6e |rue-sour|ce-filen|
|00002c70| 61 6d 65 20 74 61 72 67 | 65 74 2d 66 69 6c 65 6e |ame targ|et-filen|
|00002c80| 61 6d 65 20 6e 69 6c 20 | 74 61 72 67 65 74 2d 62 |ame nil |target-b|
|00002c90| 75 66 20 62 75 66 2d 74 | 6f 2d 70 61 74 63 68 20 |uf buf-t|o-patch |
|00002ca0| 66 69 6c 65 2d 6e 61 6d | 65 2d 6d 61 67 69 63 2d |file-nam|e-magic-|
|00002cb0| 70 20 70 61 74 63 68 2d | 72 65 74 75 72 6e 2d 63 |p patch-|return-c|
|00002cc0| 6f 64 65 20 63 74 6c 2d | 62 75 66 20 62 61 63 6b |ode ctl-|buf back|
|00002cd0| 75 70 2d 73 74 79 6c 65 | 20 61 75 78 2d 77 69 6e |up-style| aux-win|
|00002ce0| 64 20 73 74 72 69 6e 67 | 2d 6d 61 74 63 68 20 22 |d string|-match "|
|00002cf0| 56 22 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 6f |V" ediff|-patch-o|
|00002d00| 70 74 69 6f 6e 73 20 65 | 72 72 6f 72 20 22 45 64 |ptions e|rror "Ed|
|00002d10| 69 66 66 20 64 6f 65 73 | 6e 27 74 20 74 61 6b 65 |iff does|n't take|
|00002d20| 20 74 68 65 20 2d 56 20 | 6f 70 74 69 6f 6e 20 69 | the -V |option i|
|00002d30| 6e 20 60 65 64 69 66 66 | 2d 70 61 74 63 68 2d 6f |n `ediff|-patch-o|
|00002d40| 70 74 69 6f 6e 73 27 2d | 2d 73 6f 72 72 79 22 20 |ptions'-|-sorry" |
|00002d50| 65 64 69 66 66 2d 66 69 | 6e 64 2d 66 69 6c 65 20 |ediff-fi|nd-file |
|00002d60| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 70 |ediff-la|st-dir-p|
|00002d70| 61 74 63 68 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |atch sta|rtup-hoo|
|00002d80| 6b 73 20 66 69 6c 65 2d | 74 72 75 65 6e 61 6d 65 |ks file-|truename|
|00002d90| 20 65 64 69 66 66 2d 6d | 61 79 62 65 2d 63 68 65 | ediff-m|aybe-che|
|00002da0| 63 6b 6f 75 74 20 67 65 | 74 2d 62 75 66 66 65 72 |ckout ge|t-buffer|
|00002db0| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 69 6e 73 | buffer-|name ins|
|00002dc0| 65 72 74 2d 62 75 66 66 | 65 72 20 70 61 74 63 68 |ert-buff|er patch|
|00002dd0| 2d 62 75 66 20 6d 65 73 | 73 61 67 65 20 22 41 70 |-buf mes|sage "Ap|
|00002de0| 70 6c 79 69 6e 67 20 70 | 61 74 63 68 20 2e 2e 2e |plying p|atch ...|
|00002df0| 20 22 20 67 65 74 65 6e | 76 20 22 56 45 52 53 49 | " geten|v "VERSI|
|00002e00| 4f 4e 5f 43 4f 4e 54 52 | 4f 4c 22 20 73 65 74 65 |ON_CONTR|OL" sete|
|00002e10| 6e 76 20 63 61 6c 6c 2d | 70 72 6f 63 65 73 73 2d |nv call-|process-|
|00002e20| 72 65 67 69 6f 6e 20 74 | 20 73 68 65 6c 6c 2d 63 |region t| shell-c|
|00002e30| 6f 6d 6d 61 6e 64 2d 73 | 77 69 74 63 68 20 66 6f |ommand-s|witch fo|
|00002e40| 72 6d 61 74 20 22 25 73 | 20 25 73 20 25 73 20 25 |rmat "%s| %s %s %|
|00002e50| 73 22 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 70 |s" ediff|-patch-p|
|00002e60| 72 6f 67 72 61 6d 20 65 | 64 69 66 66 2d 62 61 63 |rogram e|diff-bac|
|00002e70| 6b 75 70 2d 73 70 65 63 | 73 20 74 68 69 73 2d 63 |kup-spec|s this-c|
|00002e80| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|00002e90| 74 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |t ediff-|KILLED-V|
|00002ea0| 49 54 41 4c 2d 42 55 46 | 46 45 52 20 22 41 70 70 |ITAL-BUF|FER "App|
|00002eb0| 6c 79 69 6e 67 20 70 61 | 74 63 68 20 2e 2e 2e 20 |lying pa|tch ... |
|00002ec0| 64 6f 6e 65 22 20 22 22 | 20 73 77 69 74 63 68 2d |done" ""| switch-|
|00002ed0| 74 6f 2d 62 75 66 66 65 | 72 20 73 69 74 2d 66 6f |to-buffe|r sit-fo|
|00002ee0| 72 20 30 20 65 64 69 66 | 66 2d 70 61 74 63 68 2d |r 0 edif|f-patch-|
|00002ef0| 72 65 74 75 72 6e 2d 63 | 6f 64 65 2d 6f 6b 20 66 |return-c|ode-ok f|
|00002f00| 69 6c 65 2d 65 78 69 73 | 74 73 2d 70 20 65 64 69 |ile-exis|ts-p edi|
|00002f10| 66 66 2d 62 61 63 6b 75 | 70 2d 65 78 74 65 6e 73 |ff-backu|p-extens|
|00002f20| 69 6f 6e 20 65 64 69 66 | 66 2d 6d 73 67 2d 62 75 |ion edif|f-msg-bu|
|00002f30| 66 66 65 72 20 70 72 69 | 6e 63 20 22 50 61 74 63 |ffer pri|nc "Patc|
|00002f40| 68 20 70 72 6f 67 72 61 | 6d 20 68 61 73 20 66 61 |h progra|m has fa|
|00002f50| 69 6c 65 64 20 64 75 65 | 20 74 6f 20 61 20 62 61 |iled due| to a ba|
|00002f60| 64 20 70 61 74 63 68 20 | 66 69 6c 65 2c 5c 6e 69 |d patch |file,\ni|
|00002f70| 74 20 63 6f 75 6c 64 6e | 27 74 20 61 70 70 6c 79 |t couldn|'t apply|
|00002f80| 20 61 6c 6c 20 68 75 6e | 6b 73 2c 20 4f 52 5c 6e | all hun|ks, OR\n|
|00002f90| 69 74 20 63 6f 75 6c 64 | 6e 27 74 20 63 72 65 61 |it could|n't crea|
|00002fa0| 74 65 20 74 68 65 20 62 | 61 63 6b 75 70 20 66 6f |te the b|ackup fo|
|00002fb0| 72 20 74 68 65 20 66 69 | 6c 65 20 62 65 69 6e 67 |r the fi|le being|
|00002fc0| 20 70 61 74 63 68 65 64 | 2e 5c 6e 5c 6e 54 68 65 | patched|.\n\nThe|
|00002fd0| 20 66 6f 72 6d 65 72 20 | 63 6f 75 6c 64 20 62 65 | former |could be|
|00002fe0| 20 63 61 75 73 65 64 20 | 62 79 20 61 20 63 6f 72 | caused |by a cor|
|00002ff0| 72 75 70 74 20 70 61 74 | 63 68 20 66 69 6c 65 20 |rupt pat|ch file |
|00003000| 6f 72 20 62 65 63 61 75 | 73 65 20 74 68 65 20 25 |or becau|se the %|
|00003010| 53 5c 6e 70 72 6f 67 72 | 61 6d 20 64 6f 65 73 6e |S\nprogr|am doesn|
|00003020| 27 74 20 75 6e 64 65 72 | 73 74 61 6e 64 20 74 68 |'t under|stand th|
|00003030| 65 20 66 6f 72 6d 61 74 | 20 6f 66 20 74 68 65 20 |e format| of the |
|00003040| 70 61 74 63 68 20 66 69 | 6c 65 20 69 6e 20 75 73 |patch fi|le in us|
|00003050| 65 2e 5c 6e 5c 6e 54 68 | 65 20 73 65 63 6f 6e 64 |e.\n\nTh|e second|
|00003060| 20 70 72 6f 62 6c 65 6d | 20 6d 69 67 68 74 20 62 | problem| might b|
|00003070| 65 20 64 75 65 20 74 6f | 20 61 6e 20 69 6e 63 6f |e due to| an inco|
|00003080| 6d 70 61 74 69 62 69 6c | 69 74 79 20 61 6d 6f 6e |mpatibil|ity amon|
|00003090| 67 20 74 68 65 73 65 20 | 73 65 74 74 69 6e 67 73 |g these |settings|
|000030a0| 3a 5c 6e 20 20 20 20 65 | 64 69 66 66 2d 70 61 74 |:\n e|diff-pat|
|000030b0| 63 68 2d 70 72 6f 67 72 | 61 6d 20 20 20 20 3d 20 |ch-progr|am = |
|000030c0| 25 53 20 20 20 20 20 20 | 20 20 20 20 20 20 20 65 |%S | e|
|000030d0| 64 69 66 66 2d 70 61 74 | 63 68 2d 6f 70 74 69 6f |diff-pat|ch-optio|
|000030e0| 6e 73 20 20 20 20 3d 20 | 25 53 5c 6e 20 20 20 20 |ns = |%S\n |
|000030f0| 65 64 69 66 66 2d 62 61 | 63 6b 75 70 2d 65 78 74 |ediff-ba|ckup-ext|
|00003100| 65 6e 73 69 6f 6e 20 3d | 20 25 53 20 20 20 20 20 |ension =| %S |
|00003110| 20 20 20 20 20 20 20 20 | 65 64 69 66 66 2d 62 61 | |ediff-ba|
|00003120| 63 6b 75 70 2d 73 70 65 | 63 73 20 20 20 20 20 3d |ckup-spe|cs =|
|00003130| 20 25 53 5c 6e 5c 6e 53 | 65 65 20 45 64 69 66 66 | %S\n\nS|ee Ediff|
|00003140| 20 6f 6e 2d 6c 69 6e 65 | 20 6d 61 6e 75 61 6c 20 | on-line| manual |
|00003150| 66 6f 72 20 6d 6f 72 65 | 20 64 65 74 61 69 6c 73 |for more| details|
|00003160| 20 6f 6e 20 74 68 65 73 | 65 20 76 61 72 69 61 62 | on thes|e variab|
|00003170| 6c 65 73 2e 5c 6e 49 6e | 20 70 61 72 74 69 63 75 |les.\nIn| particu|
|00003180| 6c 61 72 2c 20 63 68 65 | 63 6b 20 74 68 65 20 64 |lar, che|ck the d|
|00003190| 6f 63 75 6d 65 6e 74 61 | 74 69 6f 6e 20 66 6f 72 |ocumenta|tion for|
|000031a0| 20 60 65 64 69 66 66 2d | 62 61 63 6b 75 70 2d 73 | `ediff-|backup-s|
|000031b0| 70 65 63 73 27 2e 20 5c | 6e 5c 6e 49 6e 20 61 6e |pecs'. \|n\nIn an|
|000031c0| 79 20 6f 66 20 74 68 65 | 20 61 62 6f 76 65 20 63 |y of the| above c|
|000031d0| 61 73 65 73 2c 20 45 64 | 69 66 66 20 64 6f 65 73 |ases, Ed|iff does|
|000031e0| 6e 27 74 20 63 6f 6d 70 | 61 72 65 20 66 69 6c 65 |n't comp|are file|
|000031f0| 73 20 61 75 74 6f 6d 61 | 74 69 63 61 6c 6c 79 2e |s automa|tically.|
|00003200| 5c 6e 48 6f 77 65 76 65 | 72 2c 20 69 66 20 74 68 |\nHoweve|r, if th|
|00003210| 65 20 70 61 74 63 68 20 | 77 61 73 20 61 70 70 6c |e patch |was appl|
|00003220| 69 65 64 20 70 61 72 74 | 69 61 6c 6c 79 20 61 6e |ied part|ially an|
|00003230| 64 20 74 68 65 20 62 61 | 63 6b 75 70 20 66 69 6c |d the ba|ckup fil|
|00003240| 65 20 77 61 73 20 63 72 | 65 61 74 65 64 2c 5c 6e |e was cr|eated,\n|
|00003250| 79 6f 75 20 63 61 6e 20 | 73 74 69 6c 6c 20 65 78 |you can |still ex|
|00003260| 61 6d 69 6e 65 20 74 68 | 65 20 63 68 61 6e 67 65 |amine th|e change|
|00003270| 73 20 76 69 61 20 4d 2d | 78 20 65 64 69 66 66 2d |s via M-|x ediff-|
|00003280| 66 69 6c 65 73 22 20 62 | 65 65 70 20 31 20 67 65 |files" b|eep 1 ge|
|00003290| 74 2d 62 75 66 66 65 72 | 2d 77 69 6e 64 6f 77 20 |t-buffer|-window |
|000032a0| 73 65 6c 65 63 74 2d 77 | 69 6e 64 6f 77 20 73 77 |select-w|indow sw|
|000032b0| 69 74 63 68 2d 74 6f 2d | 62 75 66 66 65 72 2d 6f |itch-to-|buffer-o|
|000032c0| 74 68 65 72 2d 77 69 6e | 64 6f 77 20 22 50 61 74 |ther-win|dow "Pat|
|000032d0| 63 68 20 61 70 70 65 61 | 72 73 20 74 6f 20 68 61 |ch appea|rs to ha|
|000032e0| 76 65 20 66 61 69 6c 65 | 64 22 20 73 65 74 2d 76 |ve faile|d" set-v|
|000032f0| 69 73 69 74 65 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |isited-f|ile-name|
|00003300| 20 73 65 74 2d 62 75 66 | 66 65 72 2d 6d 6f 64 69 | set-buf|fer-modi|
|00003310| 66 69 65 64 2d 70 20 65 | 64 69 66 66 2d 66 69 6c |fied-p e|diff-fil|
|00003320| 65 2d 72 65 6d 6f 74 65 | 2d 70 20 22 5f 70 61 74 |e-remote|-p "_pat|
|00003330| 63 68 65 64 22 20 72 65 | 6e 61 6d 65 2d 66 69 6c |ched" re|name-fil|
|00003340| 65 20 65 64 69 66 66 2d | 73 65 74 2d 72 65 61 64 |e ediff-|set-read|
|00003350| 2d 6f 6e 6c 79 2d 69 6e | 2d 62 75 66 2d 41 20 66 |-only-in|-buf-A f|
|00003360| 69 6e 64 2d 66 69 6c 65 | 2d 6e 6f 73 65 6c 65 63 |ind-file|-noselec|
|00003370| 74 20 65 64 69 66 66 2d | 62 75 66 66 65 72 73 2d |t ediff-|buffers-|
|00003380| 69 6e 74 65 72 6e 61 6c | 20 65 70 61 74 63 68 20 |internal| epatch |
|00003390| 65 64 69 66 66 2d 70 61 | 74 63 68 62 75 66 65 72 |ediff-pa|tchbufer|
|000033a0| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 64 69 61 | ediff-p|atch-dia|
|000033b0| 67 6e 6f 73 74 69 63 73 | 20 62 75 72 79 2d 62 75 |gnostics| bury-bu|
|000033c0| 66 66 65 72 20 22 54 79 | 70 65 20 60 50 27 2c 20 |ffer "Ty|pe `P', |
|000033d0| 69 66 20 79 6f 75 20 6e | 65 65 64 20 74 6f 20 73 |if you n|eed to s|
|000033e0| 65 65 20 70 61 74 63 68 | 20 64 69 61 67 6e 6f 73 |ee patch| diagnos|
|000033f0| 74 69 63 73 22 5d 20 31 | 36 5d 29 0a 28 64 65 66 |tics"] 1|6]).(def|
|00003400| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 6d 75 6c |alias 'e|diff-mul|
|00003410| 74 69 2d 70 61 74 63 68 | 2d 69 6e 74 65 72 6e 61 |ti-patch|-interna|
|00003420| 6c 20 23 5b 28 70 61 74 | 63 68 2d 62 75 66 20 26 |l #[(pat|ch-buf &|
|00003430| 6f 70 74 69 6f 6e 61 6c | 20 73 74 61 72 74 75 70 |optional| startup|
|00003440| 2d 68 6f 6f 6b 73 29 20 | 22 c0 19 c2 0b 42 13 c4 |-hooks) |"....B..|
|00003450| c5 0e 06 ab a0 c7 0e 06 | 21 ab 9a c8 c7 0e 06 21 |........|!......!|
|00003460| 21 ab 92 72 0e 06 71 88 | c0 c9 ca 0e 06 5c 22 44 |!..r..q.|.....\"D|
|00003470| 0e 0b 29 42 aa 8a 0e 0c | cd 61 ae 84 ce 0e 0f 21 |..)B....|.a.....!|
|00003480| d0 d1 d2 0b 26 06 11 d3 | 09 21 29 87 22 20 5b 6e |....&...|.!)." [n|
|00003490| 69 6c 20 6d 65 74 61 2d | 62 75 66 20 28 6c 61 6d |il meta-|buf (lam|
|000034a0| 62 64 61 20 6e 69 6c 20 | 28 73 65 74 71 20 65 64 |bda nil |(setq ed|
|000034b0| 69 66 66 2d 73 65 73 73 | 69 6f 6e 2d 61 63 74 69 |iff-sess|ion-acti|
|000034c0| 6f 6e 2d 66 75 6e 63 74 | 69 6f 6e 20 27 65 64 69 |on-funct|ion 'edi|
|000034d0| 66 66 2d 70 61 74 63 68 | 2d 66 69 6c 65 2d 66 6f |ff-patch|-file-fo|
|000034e0| 72 6d 2d 6d 65 74 61 20 | 65 64 69 66 66 2d 6d 65 |rm-meta |ediff-me|
|000034f0| 74 61 2d 70 61 74 63 68 | 62 75 66 65 72 20 70 61 |ta-patch|bufer pa|
|00003500| 74 63 68 2d 62 75 66 29 | 29 20 73 74 61 72 74 75 |tch-buf)|) startu|
|00003510| 70 2d 68 6f 6f 6b 73 20 | 65 64 69 66 66 2d 70 72 |p-hooks |ediff-pr|
|00003520| 65 70 61 72 65 2d 6d 65 | 74 61 2d 62 75 66 66 65 |epare-me|ta-buffe|
|00003530| 72 20 65 64 69 66 66 2d | 66 69 6c 65 67 72 6f 75 |r ediff-|filegrou|
|00003540| 70 2d 61 63 74 69 6f 6e | 20 70 61 74 63 68 2d 62 |p-action| patch-b|
|00003550| 75 66 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |uf get-b|uffer bu|
|00003560| 66 66 65 72 2d 6e 61 6d | 65 20 66 6f 72 6d 61 74 |ffer-nam|e format|
|00003570| 20 22 25 53 22 20 65 64 | 69 66 66 2d 70 61 74 63 | "%S" ed|iff-patc|
|00003580| 68 2d 6d 61 70 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |h-map th|is-comma|
|00003590| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|000035a0| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|000035b0| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 20 22 2a |-VITAL-B|UFFER "*|
|000035c0| 45 64 69 66 66 20 53 65 | 73 73 69 6f 6e 20 47 72 |Ediff Se|ssion Gr|
|000035d0| 6f 75 70 20 50 61 6e 65 | 6c 22 20 65 64 69 66 66 |oup Pane|l" ediff|
|000035e0| 2d 72 65 64 72 61 77 2d | 64 69 72 65 63 74 6f 72 |-redraw-|director|
|000035f0| 79 2d 67 72 6f 75 70 2d | 62 75 66 66 65 72 20 65 |y-group-|buffer e|
|00003600| 64 69 66 66 2d 6d 75 6c | 74 69 66 69 6c 65 2d 70 |diff-mul|tifile-p|
|00003610| 61 74 63 68 20 65 64 69 | 66 66 2d 73 68 6f 77 2d |atch edi|ff-show-|
|00003620| 6d 65 74 61 2d 62 75 66 | 66 65 72 5d 20 37 5d 29 |meta-buf|fer] 7])|
|00003630| 0a | |. | |
+--------+-------------------------+-------------------------+--------+--------+
